aboutsummaryrefslogtreecommitdiffhomepage
path: root/server
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2018-01-19 14:47:03 +0100
committerChocobozzz <me@florianbigard.com>2018-01-19 14:47:03 +0100
commit2af4fa4d8ba69424a279402e1e3f9e09a90c7e45 (patch)
treef31e470bc06d3a4dce05d2ba1f533225799973a9 /server
parent23e27dd53599be65b2dc2968448ce155a00a96c9 (diff)
downloadPeerTube-2af4fa4d8ba69424a279402e1e3f9e09a90c7e45.tar.gz
PeerTube-2af4fa4d8ba69424a279402e1e3f9e09a90c7e45.tar.zst
PeerTube-2af4fa4d8ba69424a279402e1e3f9e09a90c7e45.zip
Fix tests
Diffstat (limited to 'server')
-rw-r--r--server/helpers/logger.ts3
-rw-r--r--server/middlewares/oauth.ts1
2 files changed, 3 insertions, 1 deletions
diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts
index 6a02f680a..10e8cabc8 100644
--- a/server/helpers/logger.ts
+++ b/server/helpers/logger.ts
@@ -24,8 +24,9 @@ function keysExcluder (key, value) {
24const loggerFormat = winston.format.printf((info) => { 24const loggerFormat = winston.format.printf((info) => {
25 let additionalInfos = JSON.stringify(info, keysExcluder, 2) 25 let additionalInfos = JSON.stringify(info, keysExcluder, 2)
26 if (additionalInfos === '{}') additionalInfos = '' 26 if (additionalInfos === '{}') additionalInfos = ''
27 else additionalInfos = ' ' + additionalInfos
27 28
28 return `[${info.label}] ${info.timestamp} ${info.level}: ${info.message} ${additionalInfos}` 29 return `[${info.label}] ${info.timestamp} ${info.level}: ${info.message}${additionalInfos}`
29}) 30})
30 31
31const timestampFormatter = winston.format.timestamp({ 32const timestampFormatter = winston.format.timestamp({
diff --git a/server/middlewares/oauth.ts b/server/middlewares/oauth.ts
index 41a3fb718..3cda41e5c 100644
--- a/server/middlewares/oauth.ts
+++ b/server/middlewares/oauth.ts
@@ -1,6 +1,7 @@
1import * as express from 'express' 1import * as express from 'express'
2import * as OAuthServer from 'express-oauth-server' 2import * as OAuthServer from 'express-oauth-server'
3import 'express-validator' 3import 'express-validator'
4import { logger } from '../helpers/logger'
4import { OAUTH_LIFETIME } from '../initializers' 5import { OAUTH_LIFETIME } from '../initializers'
5 6
6const oAuthServer = new OAuthServer({ 7const oAuthServer = new OAuthServer({