From 64d540f23b094c3608949434256e162f3f0cbdc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?=
 <danielgarciaaubert@gmail.com>
Date: Wed, 28 Mar 2018 12:45:03 +0200
Subject: [PATCH] Extract initProfiler middlewar

---
 lib/cartodb/controllers/map/anonymous.js              | 11 +----------
 .../controllers/map/middlewares/init-profiler.js      |  9 +++++++++
 lib/cartodb/controllers/map/named.js                  | 11 +----------
 3 files changed, 11 insertions(+), 20 deletions(-)
 create mode 100644 lib/cartodb/controllers/map/middlewares/init-profiler.js

diff --git a/lib/cartodb/controllers/map/anonymous.js b/lib/cartodb/controllers/map/anonymous.js
index 9e269a60..a8b7f353 100644
--- a/lib/cartodb/controllers/map/anonymous.js
+++ b/lib/cartodb/controllers/map/anonymous.js
@@ -8,6 +8,7 @@ const cleanUpQueryParams = require('../../middleware/clean-up-query-params');
 const credentials = require('../../middleware/credentials');
 const dbConnSetup = require('../../middleware/db-conn-setup');
 const authorize = require('../../middleware/authorize');
+const initProfiler = require('./middlewares/init-profiler');
 const cacheControlHeader = require('../../middleware/cache-control-header');
 const cacheChannelHeader = require('../../middleware/cache-channel-header');
 const surrogateKeyHeader = require('../../middleware/surrogate-key-header');
@@ -109,16 +110,6 @@ AnonymousMapController.prototype.composeCreateMapMiddleware = function () {
     ];
 };
 
-function initProfiler (isTemplateInstantiation) {
-    const operation = isTemplateInstantiation ? 'instance_template' : 'createmap';
-
-    return function initProfilerMiddleware (req, res, next) {
-        req.profiler.start(`windshaft-cartodb.${operation}_${req.method.toLowerCase()}`);
-        req.profiler.done(`${operation}.initProfilerMiddleware`);
-        next();
-    };
-}
-
 function checkJsonContentType () {
     return function checkJsonContentTypeMiddleware(req, res, next) {
         if (req.method === 'POST' && !req.is('application/json')) {
diff --git a/lib/cartodb/controllers/map/middlewares/init-profiler.js b/lib/cartodb/controllers/map/middlewares/init-profiler.js
new file mode 100644
index 00000000..6d0be211
--- /dev/null
+++ b/lib/cartodb/controllers/map/middlewares/init-profiler.js
@@ -0,0 +1,9 @@
+module.exports = function initProfiler (isTemplateInstantiation) {
+    const operation = isTemplateInstantiation ? 'instance_template' : 'createmap';
+
+    return function initProfilerMiddleware (req, res, next) {
+        req.profiler.start(`windshaft-cartodb.${operation}_${req.method.toLowerCase()}`);
+        req.profiler.done(`${operation}.initProfilerMiddleware`);
+        next();
+    };
+};
diff --git a/lib/cartodb/controllers/map/named.js b/lib/cartodb/controllers/map/named.js
index 9f4c6433..ecaf3917 100644
--- a/lib/cartodb/controllers/map/named.js
+++ b/lib/cartodb/controllers/map/named.js
@@ -4,6 +4,7 @@ const cleanUpQueryParams = require('../../middleware/clean-up-query-params');
 const credentials = require('../../middleware/credentials');
 const dbConnSetup = require('../../middleware/db-conn-setup');
 const authorize = require('../../middleware/authorize');
+const initProfiler = require('./middlewares/init-profiler');
 const cacheControlHeader = require('../../middleware/cache-control-header');
 const cacheChannelHeader = require('../../middleware/cache-channel-header');
 const surrogateKeyHeader = require('../../middleware/surrogate-key-header');
@@ -119,16 +120,6 @@ NamedMapController.prototype.composeInstantiateTemplateMiddleware = function ()
     ];
 };
 
-function initProfiler (isTemplateInstantiation) {
-    const operation = isTemplateInstantiation ? 'instance_template' : 'createmap';
-
-    return function initProfilerMiddleware (req, res, next) {
-        req.profiler.start(`windshaft-cartodb.${operation}_${req.method.toLowerCase()}`);
-        req.profiler.done(`${operation}.initProfilerMiddleware`);
-        next();
-    };
-}
-
 function checkJsonContentType () {
     return function checkJsonContentTypeMiddleware(req, res, next) {
         if (req.method === 'POST' && !req.is('application/json')) {