Adapt JSON output to the standard structure

lib/api/api-router.js

@@ -199,12 +199,12 @@ module.exports = class ApiRouter {
             const apiRouter = router({ mergeParams: true });
             const { paths, middlewares = [] } = route;
 
+            apiRouter.use(user(this.metadataBackend));
             apiRouter.use(initLogger({ logger: this.serverOptions.logger }));
             apiRouter.use(profiler({
                 enabled: this.serverOptions.useProfiler,
                 statsClient: global.statsClient
             }));
-            apiRouter.use(user(this.metadataBackend));
 
             middlewares.forEach(middleware => apiRouter.use(middleware()));
 
@@ -236,10 +236,10 @@ function createTemplateMaps ({ redisPool, surrogateKeysCache, logger }) {
         const startTime = Date.now();
         surrogateKeysCache.invalidate(new NamedMapsCacheEntry(user, templateName), (err) => {
             if (err) {
-                return logger.error(err, `Named map (${templateName}) invalidation failed, user: ${user}`);
+                return logger.error({ error: err, 'cdb-user': user, template_id: templateName }, 'Named map invalidation failed');
             }
 
-            logger.info({ user, type: 'named_map_invalidation', elapsed: Date.now() - startTime }, `Named map (${templateName}) invalidation success, user: ${user}`);
+            logger.info({ 'cdb-user': user, template_id: templateName, duration: (Date.now() - startTime) / 1000 }, 'Named map invalidation success');
         });
     }