From 9f9b933607447b90f85097c1e8c2485455870b37 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 16 Jul 2018 16:52:26 +0200 Subject: [PATCH 1/3] Add create layergroup stats --- lib/cartodb/api/map/anonymous-map-controller.js | 4 +++- lib/cartodb/api/template/named-template-controller.js | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/cartodb/api/map/anonymous-map-controller.js b/lib/cartodb/api/map/anonymous-map-controller.js index 6bbacd37..5ac5659f 100644 --- a/lib/cartodb/api/map/anonymous-map-controller.js +++ b/lib/cartodb/api/map/anonymous-map-controller.js @@ -196,8 +196,10 @@ function createLayergroup (mapBackend, userLimitsBackend, pgConnection, affected const mapParams = { dbuser, dbname, dbpassword, dbhost, dbport }; - mapBackend.createLayergroup(mapConfig, mapParams, mapConfigProvider, (err, layergroup) => { + mapBackend.createLayergroup(mapConfig, mapParams, mapConfigProvider, (err, layergroup, stats = {}) => { req.profiler.done('createLayergroup'); + req.profiler.add(stats); + if (err) { return next(err); } diff --git a/lib/cartodb/api/template/named-template-controller.js b/lib/cartodb/api/template/named-template-controller.js index 0af1ad65..801f4ccd 100644 --- a/lib/cartodb/api/template/named-template-controller.js +++ b/lib/cartodb/api/template/named-template-controller.js @@ -192,8 +192,10 @@ function instantiateLayergroup (mapBackend, userLimitsBackend, pgConnection, aff rendererParams ); - mapBackend.createLayergroup(mapConfig, rendererParams, mapConfigProvider, (err, layergroup) => { + mapBackend.createLayergroup(mapConfig, rendererParams, mapConfigProvider, (err, layergroup, stats = {}) => { req.profiler.done('createLayergroup'); + req.profiler.add(stats); + if (err) { return next(err); } From 81eb849aff8d676ffd4fabc91d629043ff849c6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 16 Jul 2018 16:58:53 +0200 Subject: [PATCH 2/3] Add stats first --- lib/cartodb/api/map/anonymous-map-controller.js | 2 +- lib/cartodb/api/template/named-template-controller.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/cartodb/api/map/anonymous-map-controller.js b/lib/cartodb/api/map/anonymous-map-controller.js index 5ac5659f..c8864c1d 100644 --- a/lib/cartodb/api/map/anonymous-map-controller.js +++ b/lib/cartodb/api/map/anonymous-map-controller.js @@ -197,8 +197,8 @@ function createLayergroup (mapBackend, userLimitsBackend, pgConnection, affected const mapParams = { dbuser, dbname, dbpassword, dbhost, dbport }; mapBackend.createLayergroup(mapConfig, mapParams, mapConfigProvider, (err, layergroup, stats = {}) => { - req.profiler.done('createLayergroup'); req.profiler.add(stats); + req.profiler.done('createLayergroup'); if (err) { return next(err); diff --git a/lib/cartodb/api/template/named-template-controller.js b/lib/cartodb/api/template/named-template-controller.js index 801f4ccd..77698547 100644 --- a/lib/cartodb/api/template/named-template-controller.js +++ b/lib/cartodb/api/template/named-template-controller.js @@ -193,8 +193,8 @@ function instantiateLayergroup (mapBackend, userLimitsBackend, pgConnection, aff ); mapBackend.createLayergroup(mapConfig, rendererParams, mapConfigProvider, (err, layergroup, stats = {}) => { - req.profiler.done('createLayergroup'); req.profiler.add(stats); + req.profiler.done('createLayergroup'); if (err) { return next(err); From f9b59d854971ae381e386c58ebcbd3e7c9f30631 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa=20Aubert?= Date: Mon, 16 Jul 2018 17:18:58 +0200 Subject: [PATCH 3/3] Do not override stats --- lib/cartodb/api/map/anonymous-map-controller.js | 1 - lib/cartodb/api/template/named-template-controller.js | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/cartodb/api/map/anonymous-map-controller.js b/lib/cartodb/api/map/anonymous-map-controller.js index c8864c1d..8a17add3 100644 --- a/lib/cartodb/api/map/anonymous-map-controller.js +++ b/lib/cartodb/api/map/anonymous-map-controller.js @@ -198,7 +198,6 @@ function createLayergroup (mapBackend, userLimitsBackend, pgConnection, affected mapBackend.createLayergroup(mapConfig, mapParams, mapConfigProvider, (err, layergroup, stats = {}) => { req.profiler.add(stats); - req.profiler.done('createLayergroup'); if (err) { return next(err); diff --git a/lib/cartodb/api/template/named-template-controller.js b/lib/cartodb/api/template/named-template-controller.js index 77698547..a1ed2c01 100644 --- a/lib/cartodb/api/template/named-template-controller.js +++ b/lib/cartodb/api/template/named-template-controller.js @@ -194,7 +194,6 @@ function instantiateLayergroup (mapBackend, userLimitsBackend, pgConnection, aff mapBackend.createLayergroup(mapConfig, rendererParams, mapConfigProvider, (err, layergroup, stats = {}) => { req.profiler.add(stats); - req.profiler.done('createLayergroup'); if (err) { return next(err);