diff --git a/dht-node/log4js-config.json b/dht-node/log4js-config.json index d1b5db673..877bc4255 100644 --- a/dht-node/log4js-config.json +++ b/dht-node/log4js-config.json @@ -1,40 +1,14 @@ { "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": { "type": "dateFile", - "filename": "../logs/dht/apiversion-%v-%p.log", + "filename": "../logs/dht-node/apiversion-%v.log", "pattern": "yyyy-MM-dd", "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, "fileNameSep" : "_", @@ -43,11 +17,11 @@ "errorFile": { "type": "dateFile", - "filename": "../logs/dht/errors-%p.log", + "filename": "../logs/dht-node/errors.log", "pattern": "yyyy-MM-dd", "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, "fileNameSep" : "_", @@ -66,15 +40,7 @@ { "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": { @@ -88,17 +54,6 @@ "level": "debug", "enableCallStack": true }, - "apollo": - { - "appenders": - [ - "apollo", - "apolloOut", - "errors" - ], - "level": "debug", - "enableCallStack": true - }, "dht": { "appenders": @@ -109,14 +64,6 @@ ], "level": "debug", "enableCallStack": true - }, - "http": - { - "appenders": - [ - "access" - ], - "level": "info" } } } diff --git a/dht-node/src/server/logger.ts b/dht-node/src/server/logger.ts index 5f18d1628..92d930b40 100644 --- a/dht-node/src/server/logger.ts +++ b/dht-node/src/server/logger.ts @@ -6,21 +6,15 @@ import { readFileSync } from 'fs' const options = JSON.parse(readFileSync(CONFIG.LOG4JS_CONFIG, 'utf-8')) options.categories.dht.level = CONFIG.LOG_LEVEL -options.categories.apollo.level = CONFIG.LOG_LEVEL let filename: string = options.appenders.dht.filename options.appenders.dht.filename = filename.replace( 'apiversion-%v', 'dht-' + CONFIG.FEDERATION_DHT_TOPIC, ) -filename = options.appenders.access.filename -filename = options.appenders.apollo.filename filename = options.appenders.errorFile.filename log4js.configure(options) -const apolloLogger = log4js.getLogger('apollo') const logger = log4js.getLogger('dht') -// backendLogger.addContext('user', 'unknown') - -export { apolloLogger, logger } +export { logger } diff --git a/docker-compose.yml b/docker-compose.yml index cd63ca35c..fb15c13d6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -124,7 +124,7 @@ services: dockerfile: ./dht-node/Dockerfile target: production networks: - #- internal-net + - internal-net - external-net #ports: # - 5000:5000