diff --git a/NEWS.md b/NEWS.md index 9806f7da..85cbd03b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,12 @@ -1.13.1 -- 2014-mm-dd +1.13.2 -- 2014-mm-dd -------------------- +1.13.1 -- 2014-08-04 +-------------------- + +Enhancements: + - Profiler header sent as JSON string + 1.13.0 -- 2014-07-30 -------------------- diff --git a/lib/cartodb/cartodb_windshaft.js b/lib/cartodb/cartodb_windshaft.js index f71fc891..eea30870 100644 --- a/lib/cartodb/cartodb_windshaft.js +++ b/lib/cartodb/cartodb_windshaft.js @@ -240,8 +240,7 @@ var CartodbWindshaft = function(serverOptions) { }, function finish(err, response){ if ( req.profiler ) { - var report = req.profiler.toString(); - res.header('X-Tiler-Profiler', report); + res.header('X-Tiler-Profiler', req.profiler.toJSONString()); } if (err){ response = { error: ''+err }; @@ -297,8 +296,7 @@ var CartodbWindshaft = function(serverOptions) { }, function finish(err, response){ if ( req.profiler ) { - var report = req.profiler.toString(); - res.header('X-Tiler-Profiler', report); + res.header('X-Tiler-Profiler', req.profiler.toJSONString()); } if (err){ var statusCode = 400; @@ -609,8 +607,7 @@ var CartodbWindshaft = function(serverOptions) { function finish_instanciation(err, response, res, req) { if ( req.profiler ) { - var report = req.profiler.toString(); - res.header('X-Tiler-Profiler', report); + res.header('X-Tiler-Profiler', req.profiler.toJSONString()); } if (err) { var statusCode = 400; diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 9f399310..a331beb6 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "1.13.1", + "version": "1.13.2", "dependencies": { "node-varnish": { "version": "0.3.0", diff --git a/package.json b/package.json index 6ff73042..74daefb7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "1.13.1", + "version": "1.13.2", "description": "A map tile server for CartoDB", "keywords": [ "cartodb"