Add max file size, max files and ip anonymize log options

pull/2157/head
Chocobozzz 2019-12-12 17:15:38 +01:00
parent 22a73cb879
commit 2f6b5e2d6e
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 16 additions and 5 deletions

View File

@ -86,6 +86,9 @@ log:
level: 'info' # debug/info/warning/error level: 'info' # debug/info/warning/error
rotation: rotation:
enabled : true enabled : true
maxFileSize: 12MB
maxFiles: 20
anonymizeIP: false
search: search:
# Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance

View File

@ -87,6 +87,9 @@ log:
level: 'info' # debug/info/warning/error level: 'info' # debug/info/warning/error
rotation: rotation:
enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate enabled : true # Enabled by default, if disabled make sure that 'storage.logs' is pointing to a folder handled by logrotate
maxFileSize: 12MB
maxFiles: 20
anonymizeIP: false
search: search:
# Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance # Add ability to fetch remote videos/actors by their URI, that may not be federated with your instance

View File

@ -142,7 +142,7 @@ if (isTestInstance()) {
// For the logger // For the logger
morgan.token('remote-addr', req => { morgan.token('remote-addr', req => {
if (req.get('DNT') === '1') { if (CONFIG.LOG.ANONYMIZE_IP === true || req.get('DNT') === '1') {
return anonymize(req.ip, 16, 16) return anonymize(req.ip, 16, 16)
} }

View File

@ -67,9 +67,9 @@ const fileLoggerOptions: FileTransportOptions = {
) )
} }
if (CONFIG.LOG.ROTATION) { if (CONFIG.LOG.ROTATION.ENABLED) {
fileLoggerOptions.maxsize = 1024 * 1024 * 12 fileLoggerOptions.maxsize = CONFIG.LOG.ROTATION.MAX_FILE_SIZE
fileLoggerOptions.maxFiles = 20 fileLoggerOptions.maxFiles = CONFIG.LOG.ROTATION.MAX_FILES
} }
const logger = winston.createLogger({ const logger = winston.createLogger({

View File

@ -93,7 +93,12 @@ const CONFIG = {
TRUST_PROXY: config.get<string[]>('trust_proxy'), TRUST_PROXY: config.get<string[]>('trust_proxy'),
LOG: { LOG: {
LEVEL: config.get<string>('log.level'), LEVEL: config.get<string>('log.level'),
ROTATION: config.get<boolean>('log.rotation.enabled') ROTATION: {
ENABLED: config.get<boolean>('log.rotation.enabled'),
MAX_FILE_SIZE: bytes.parse(config.get<string>('log.rotation.maxFileSize')),
MAX_FILES: config.get<number>('log.rotation.maxFiles')
},
ANONYMIZE_IP: config.get<boolean>('log.anonymizeIP')
}, },
SEARCH: { SEARCH: {
REMOTE_URI: { REMOTE_URI: {