diff --git a/config/default.yaml b/config/default.yaml index e4e2d2273..a213d5b0a 100644 --- a/config/default.yaml +++ b/config/default.yaml @@ -75,6 +75,8 @@ storage: log: level: 'info' # debug/info/warning/error + rotation: + enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate search: # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance diff --git a/config/production.yaml.example b/config/production.yaml.example index bd0d956bd..cdf6136d8 100644 --- a/config/production.yaml.example +++ b/config/production.yaml.example @@ -76,6 +76,8 @@ storage: log: level: 'info' # debug/info/warning/error + rotation: + enabled : true search: # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance diff --git a/server/helpers/logger.ts b/server/helpers/logger.ts index 734523b01..8603dd761 100644 --- a/server/helpers/logger.ts +++ b/server/helpers/logger.ts @@ -2,6 +2,7 @@ import { mkdirpSync } from 'fs-extra' import * as path from 'path' import * as winston from 'winston' +import { FileTransportOptions } from 'winston/lib/winston/transports' import { CONFIG } from '../initializers/config' import { omit } from 'lodash' @@ -45,6 +46,21 @@ const labelFormatter = winston.format.label({ label }) +const fileLoggerOptions: FileTransportOptions = { + + filename: path.join(CONFIG.STORAGE.LOG_DIR, 'peertube.log'), + handleExceptions: true, + format: winston.format.combine( + winston.format.timestamp(), + jsonLoggerFormat + ) +} + +if (CONFIG.LOG.ROTATION) { + fileLoggerOptions.maxsize = 1024 * 1024 * 12 + fileLoggerOptions.maxFiles = 20 +} + const logger = winston.createLogger({ level: CONFIG.LOG.LEVEL, format: winston.format.combine( @@ -52,16 +68,7 @@ const logger = winston.createLogger({ winston.format.splat() ), transports: [ - new winston.transports.File({ - filename: path.join(CONFIG.STORAGE.LOG_DIR, 'peertube.log'), - handleExceptions: true, - maxsize: 1024 * 1024 * 12, - maxFiles: 20, - format: winston.format.combine( - winston.format.timestamp(), - jsonLoggerFormat - ) - }), + new winston.transports.File(fileLoggerOptions), new winston.transports.Console({ handleExceptions: true, format: winston.format.combine( diff --git a/server/initializers/config.ts b/server/initializers/config.ts index 2be300a57..50653b0a0 100644 --- a/server/initializers/config.ts +++ b/server/initializers/config.ts @@ -83,7 +83,8 @@ const CONFIG = { }, TRUST_PROXY: config.get('trust_proxy'), LOG: { - LEVEL: config.get('log.level') + LEVEL: config.get('log.level'), + ROTATION: config.get('log.rotation.enabled') }, SEARCH: { REMOTE_URI: {