Do not bind logger to global object, now it's a part of serverOptions

lib/api/api-router.js

@@ -47,7 +47,7 @@ const LayergroupMetadata = require('../utils/layergroup-metadata');
 const RendererStatsReporter = require('../stats/reporter/renderer');
 
 const initializeStatusCode = require('./middlewares/initialize-status-code');
-const logger = require('./middlewares/logger');
+const initLogger = require('./middlewares/logger');
 const bodyParser = require('body-parser');
 const servedByHostHeader = require('./middlewares/served-by-host-header');
 const stats = require('./middlewares/stats');
@@ -97,7 +97,7 @@ module.exports = class ApiRouter {
 
         const surrogateKeysCacheBackends = createSurrogateKeysCacheBackends(serverOptions);
         const surrogateKeysCache = new SurrogateKeysCache(surrogateKeysCacheBackends);
-        const templateMaps = createTemplateMaps({ redisPool, surrogateKeysCache });
+        const templateMaps = createTemplateMaps({ redisPool, surrogateKeysCache, logger: this.serverOptions.logger });
 
         const analysisStatusBackend = new AnalysisStatusBackend();
         const analysisBackend = new AnalysisBackend(metadataBackend, serverOptions.analysis);
@@ -200,7 +200,7 @@ module.exports = class ApiRouter {
 
             middlewares.forEach(middleware => apiRouter.use(middleware()));
 
-            apiRouter.use(logger());
+            apiRouter.use(initLogger({ logger: this.serverOptions.logger }));
             apiRouter.use(initializeStatusCode());
             apiRouter.use(bodyParser.json());
             apiRouter.use(servedByHostHeader());
@@ -225,7 +225,7 @@ module.exports = class ApiRouter {
     }
 };
 
-function createTemplateMaps ({ redisPool, surrogateKeysCache }) {
+function createTemplateMaps ({ redisPool, surrogateKeysCache, logger }) {
     const templateMaps = new TemplateMaps(redisPool, {
         max_user_templates: global.environment.maxUserTemplates
     });
@@ -234,10 +234,10 @@ function createTemplateMaps ({ redisPool, surrogateKeysCache }) {
         const startTime = Date.now();
         surrogateKeysCache.invalidate(new NamedMapsCacheEntry(user, templateName), (err) => {
             if (err) {
-                return global.logger.error(err);
+                return logger.error(err);
             }
 
-            global.logger.info({ user, type: 'named_map_invalidation', elapsed: Date.now() - startTime });
+            logger.info({ user, type: 'named_map_invalidation', elapsed: Date.now() - startTime });
         });
     }
 

lib/api/middlewares/logger.js

@@ -2,13 +2,13 @@
 
 const uuid = require('uuid');
 
-module.exports = function logger () {
-    return function loggerMiddleware (req, res, next) {
+module.exports = function initLogger ({ logger }) {
+    return function initLoggerMiddleware (req, res, next) {
         const id = req.get('X-Request-Id') || uuid.v4();
-        const logger = res.locals.logger = global.logger.child({ id });
+        res.locals.logger = logger.child({ id });
 
-        logger.info(req);
-        res.on('finish', () => logger.info(res));
+        res.locals.logger.info(req);
+        res.on('finish', () => res.locals.logger.info(res));
 
         next();
     };