clean logger

This commit is contained in:
Ulf Gebhardt 2023-01-28 05:18:06 +01:00
parent a819b71acc
commit b15d16aecc
Signed by: ulfgebhardt
GPG Key ID: DA6B843E748679C9
3 changed files with 7 additions and 66 deletions

View File

@ -1,40 +1,14 @@
{ {
"appenders": "appenders":
{ {
"access":
{
"type": "dateFile",
"filename": "../logs/dht/access-%p.log",
"pattern": "yyyy-MM-dd",
"layout":
{
"type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m"
},
"keepFileExt" : true,
"fileNameSep" : "_",
"numBackups" : 30
},
"apollo":
{
"type": "dateFile",
"filename": "../logs/dht/apollo-%p.log",
"pattern": "yyyy-MM-dd",
"layout":
{
"type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m"
},
"keepFileExt" : true,
"fileNameSep" : "_",
"numBackups" : 30
},
"dht": "dht":
{ {
"type": "dateFile", "type": "dateFile",
"filename": "../logs/dht/apiversion-%v-%p.log", "filename": "../logs/dht-node/apiversion-%v.log",
"pattern": "yyyy-MM-dd", "pattern": "yyyy-MM-dd",
"layout": "layout":
{ {
"type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" "type": "pattern", "pattern": "%d{ISO8601} %c [%X{user}] [%f : %l] - %m"
}, },
"keepFileExt" : true, "keepFileExt" : true,
"fileNameSep" : "_", "fileNameSep" : "_",
@ -43,11 +17,11 @@
"errorFile": "errorFile":
{ {
"type": "dateFile", "type": "dateFile",
"filename": "../logs/dht/errors-%p.log", "filename": "../logs/dht-node/errors.log",
"pattern": "yyyy-MM-dd", "pattern": "yyyy-MM-dd",
"layout": "layout":
{ {
"type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" "type": "pattern", "pattern": "%d{ISO8601} %c [%X{user}] [%f : %l] - %m"
}, },
"keepFileExt" : true, "keepFileExt" : true,
"fileNameSep" : "_", "fileNameSep" : "_",
@ -66,15 +40,7 @@
{ {
"type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m" "type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m"
} }
}, }
"apolloOut":
{
"type": "stdout",
"layout":
{
"type": "pattern", "pattern": "%d{ISO8601} %p %c [%X{user}] [%f : %l] - %m"
}
}
}, },
"categories": "categories":
{ {
@ -88,17 +54,6 @@
"level": "debug", "level": "debug",
"enableCallStack": true "enableCallStack": true
}, },
"apollo":
{
"appenders":
[
"apollo",
"apolloOut",
"errors"
],
"level": "debug",
"enableCallStack": true
},
"dht": "dht":
{ {
"appenders": "appenders":
@ -109,14 +64,6 @@
], ],
"level": "debug", "level": "debug",
"enableCallStack": true "enableCallStack": true
},
"http":
{
"appenders":
[
"access"
],
"level": "info"
} }
} }
} }

View File

@ -6,21 +6,15 @@ import { readFileSync } from 'fs'
const options = JSON.parse(readFileSync(CONFIG.LOG4JS_CONFIG, 'utf-8')) const options = JSON.parse(readFileSync(CONFIG.LOG4JS_CONFIG, 'utf-8'))
options.categories.dht.level = CONFIG.LOG_LEVEL options.categories.dht.level = CONFIG.LOG_LEVEL
options.categories.apollo.level = CONFIG.LOG_LEVEL
let filename: string = options.appenders.dht.filename let filename: string = options.appenders.dht.filename
options.appenders.dht.filename = filename.replace( options.appenders.dht.filename = filename.replace(
'apiversion-%v', 'apiversion-%v',
'dht-' + CONFIG.FEDERATION_DHT_TOPIC, 'dht-' + CONFIG.FEDERATION_DHT_TOPIC,
) )
filename = options.appenders.access.filename
filename = options.appenders.apollo.filename
filename = options.appenders.errorFile.filename filename = options.appenders.errorFile.filename
log4js.configure(options) log4js.configure(options)
const apolloLogger = log4js.getLogger('apollo')
const logger = log4js.getLogger('dht') const logger = log4js.getLogger('dht')
// backendLogger.addContext('user', 'unknown') export { logger }
export { apolloLogger, logger }

View File

@ -124,7 +124,7 @@ services:
dockerfile: ./dht-node/Dockerfile dockerfile: ./dht-node/Dockerfile
target: production target: production
networks: networks:
#- internal-net - internal-net
- external-net - external-net
#ports: #ports:
# - 5000:5000 # - 5000:5000