diff options
author | Chocobozzz <me@florianbigard.com> | 2019-12-11 14:14:01 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2019-12-11 14:14:01 +0100 |
commit | 566c125d6eee3bd907404523d94e1e0b5e403a46 (patch) | |
tree | c477cdd2ba745015d80052968c37927b1bca1254 /server/helpers | |
parent | 92e0f42e8ce5f1ab5e4023900b8194627231a11b (diff) | |
download | PeerTube-566c125d6eee3bd907404523d94e1e0b5e403a46.tar.gz PeerTube-566c125d6eee3bd907404523d94e1e0b5e403a46.tar.zst PeerTube-566c125d6eee3bd907404523d94e1e0b5e403a46.zip |
Serve audit logs to client
Diffstat (limited to 'server/helpers')
-rw-r--r-- | server/helpers/audit-logger.ts | 3 | ||||
-rw-r--r-- | server/helpers/logger.ts | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/server/helpers/audit-logger.ts b/server/helpers/audit-logger.ts index f536da439..9b258dc3a 100644 --- a/server/helpers/audit-logger.ts +++ b/server/helpers/audit-logger.ts | |||
@@ -9,6 +9,7 @@ import { User, VideoAbuse, VideoChannel, VideoDetails, VideoImport } from '../.. | |||
9 | import { VideoComment } from '../../shared/models/videos/video-comment.model' | 9 | import { VideoComment } from '../../shared/models/videos/video-comment.model' |
10 | import { CustomConfig } from '../../shared/models/server/custom-config.model' | 10 | import { CustomConfig } from '../../shared/models/server/custom-config.model' |
11 | import { CONFIG } from '../initializers/config' | 11 | import { CONFIG } from '../initializers/config' |
12 | import { AUDIT_LOG_FILENAME } from '@server/initializers/constants' | ||
12 | 13 | ||
13 | function getAuditIdFromRes (res: express.Response) { | 14 | function getAuditIdFromRes (res: express.Response) { |
14 | return res.locals.oauth.token.User.username | 15 | return res.locals.oauth.token.User.username |
@@ -29,7 +30,7 @@ const auditLogger = winston.createLogger({ | |||
29 | levels: { audit: 0 }, | 30 | levels: { audit: 0 }, |
30 | transports: [ | 31 | transports: [ |
31 | new winston.transports.File({ | 32 | new winston.transports.File({ |
32 | filename: path.join(CONFIG.STORAGE.LOG_DIR, 'peertube-audit.log'), | 33 | filename: path.join(CONFIG.STORAGE.LOG_DIR, AUDIT_LOG_FILENAME), |
33 | level: 'audit', | 34 | level: 'audit', |
34 | maxsize: 5242880, | 35 | maxsize: 5242880, |
35 | maxFiles: 5, | 36 | maxFiles: 5, |
diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts index d21746963..c2ff2bae6 100644 --- a/server/helpers/logger.ts +++ b/server/helpers/logger.ts | |||
@@ -5,6 +5,7 @@ import * as winston from 'winston' | |||
5 | import { FileTransportOptions } from 'winston/lib/winston/transports' | 5 | import { FileTransportOptions } from 'winston/lib/winston/transports' |
6 | import { CONFIG } from '../initializers/config' | 6 | import { CONFIG } from '../initializers/config' |
7 | import { omit } from 'lodash' | 7 | import { omit } from 'lodash' |
8 | import { LOG_FILENAME } from '@server/initializers/constants' | ||
8 | 9 | ||
9 | const label = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT | 10 | const label = CONFIG.WEBSERVER.HOSTNAME + ':' + CONFIG.WEBSERVER.PORT |
10 | 11 | ||
@@ -58,7 +59,7 @@ const labelFormatter = winston.format.label({ | |||
58 | }) | 59 | }) |
59 | 60 | ||
60 | const fileLoggerOptions: FileTransportOptions = { | 61 | const fileLoggerOptions: FileTransportOptions = { |
61 | filename: path.join(CONFIG.STORAGE.LOG_DIR, 'peertube.log'), | 62 | filename: path.join(CONFIG.STORAGE.LOG_DIR, LOG_FILENAME), |
62 | handleExceptions: true, | 63 | handleExceptions: true, |
63 | format: winston.format.combine( | 64 | format: winston.format.combine( |
64 | winston.format.timestamp(), | 65 | winston.format.timestamp(), |