diff --git a/lib/api/api-router.js b/lib/api/api-router.js index 1c8bb989..473dbcb1 100644 --- a/lib/api/api-router.js +++ b/lib/api/api-router.js @@ -236,7 +236,7 @@ function createTemplateMaps ({ redisPool, surrogateKeysCache, logger }) { const startTime = Date.now(); surrogateKeysCache.invalidate(new NamedMapsCacheEntry(user, templateName), (err) => { if (err) { - return logger.error({ error: err, 'cdb-user': user, template_id: templateName }, 'Named map invalidation failed'); + return logger.error({ exception: err, 'cdb-user': user, template_id: templateName }, 'Named map invalidation failed'); } logger.info({ 'cdb-user': user, template_id: templateName, duration: (Date.now() - startTime) / 1000 }, 'Named map invalidation success'); diff --git a/lib/api/map/preview-template-controller.js b/lib/api/map/preview-template-controller.js index aca64a10..b49e1e7a 100644 --- a/lib/api/map/preview-template-controller.js +++ b/lib/api/map/preview-template-controller.js @@ -343,7 +343,7 @@ function incrementMapViews ({ metadataBackend }) { mapConfigProvider.getMapConfig((err, mapConfig) => { if (err) { - logger.warn({ error: err }, 'Failed to increment mapview count'); + logger.warn({ exception: err }, 'Failed to increment mapview count'); return next(); } @@ -353,7 +353,7 @@ function incrementMapViews ({ metadataBackend }) { metadataBackend.incMapviewCount(user, statTag, (err) => { if (err) { - logger.warn({ error: err }, 'Failed to increment mapview count'); + logger.warn({ exception: err }, 'Failed to increment mapview count'); } next(); diff --git a/lib/api/middlewares/cache-channel-header.js b/lib/api/middlewares/cache-channel-header.js index 3092fa83..bc4a8207 100644 --- a/lib/api/middlewares/cache-channel-header.js +++ b/lib/api/middlewares/cache-channel-header.js @@ -10,7 +10,7 @@ module.exports = function setCacheChannelHeader () { mapConfigProvider.getAffectedTables((err, affectedTables) => { if (err) { - logger.warn({ error: err }, 'Error generating Cache Channel Header'); + logger.warn({ exception: err }, 'Error generating Cache Channel Header'); return next(); } diff --git a/lib/api/middlewares/cache-control-header.js b/lib/api/middlewares/cache-control-header.js index ecaf4b1d..875f78f1 100644 --- a/lib/api/middlewares/cache-control-header.js +++ b/lib/api/middlewares/cache-control-header.js @@ -44,7 +44,7 @@ module.exports = function setCacheControlHeader ({ mapConfigProvider.getAffectedTables((err, affectedTables) => { if (err) { - logger.warn({ error: err }, 'Error generating Cache Control Header'); + logger.warn({ exception: err }, 'Error generating Cache Control Header'); return next(); } diff --git a/lib/api/middlewares/error-middleware.js b/lib/api/middlewares/error-middleware.js index 5c6f2de2..3890761f 100644 --- a/lib/api/middlewares/error-middleware.js +++ b/lib/api/middlewares/error-middleware.js @@ -7,7 +7,7 @@ module.exports = function errorMiddleware (/* options */) { const { logger } = res.locals; const errors = populateLimitErrors(Array.isArray(err) ? err : [err]); - errors.forEach((err) => logger.error({ error: err }, 'Error while handling the request')); + errors.forEach((err) => logger.error({ exception: err }, 'Error while handling the request')); setCommonHeaders(req, res, () => { const errorResponseBody = { diff --git a/lib/api/middlewares/increment-map-view-count.js b/lib/api/middlewares/increment-map-view-count.js index fde79e64..e070412b 100644 --- a/lib/api/middlewares/increment-map-view-count.js +++ b/lib/api/middlewares/increment-map-view-count.js @@ -7,7 +7,7 @@ module.exports = function incrementMapViewCount (metadataBackend) { metadataBackend.incMapviewCount(user, statTag, (err) => { if (err) { - logger.warn({ error: err }, 'Failed to increment mapview count'); + logger.warn({ exception: err }, 'Failed to increment mapview count'); } next(); diff --git a/lib/api/middlewares/last-modified-header.js b/lib/api/middlewares/last-modified-header.js index f15d052c..8a224c89 100644 --- a/lib/api/middlewares/last-modified-header.js +++ b/lib/api/middlewares/last-modified-header.js @@ -21,7 +21,7 @@ module.exports = function setLastModifiedHeader () { mapConfigProvider.getAffectedTables((err, affectedTables) => { if (err) { - logger.warn({ error: err }, 'Error generating Last Modified Header'); + logger.warn({ exception: err }, 'Error generating Last Modified Header'); return next(); } diff --git a/lib/api/middlewares/metrics.js b/lib/api/middlewares/metrics.js index e27829e0..aea87d61 100644 --- a/lib/api/middlewares/metrics.js +++ b/lib/api/middlewares/metrics.js @@ -23,7 +23,7 @@ module.exports = function metrics ({ enabled, tags, metricsBackend }) { const { event, attributes } = getEventData(req, res, tags); metricsBackend.send(event, attributes) - .catch((err) => logger.error({ error: err, event }, 'Failed to publish event')); + .catch((err) => logger.error({ exception: err, event }, 'Failed to publish event')); }); return next(); diff --git a/lib/api/middlewares/surrogate-key-header.js b/lib/api/middlewares/surrogate-key-header.js index cb41861c..3b33885f 100644 --- a/lib/api/middlewares/surrogate-key-header.js +++ b/lib/api/middlewares/surrogate-key-header.js @@ -17,7 +17,7 @@ module.exports = function setSurrogateKeyHeader ({ surrogateKeysCache }) { mapConfigProvider.getAffectedTables((err, affectedTables) => { if (err) { - logger.warn({ error: err }, 'Error generating Surrogate Key Header'); + logger.warn({ exception: err }, 'Error generating Surrogate Key Header'); return next(); } diff --git a/lib/models/mapconfig/adapter/turbo-carto-adapter.js b/lib/models/mapconfig/adapter/turbo-carto-adapter.js index f127c7ac..59891787 100644 --- a/lib/models/mapconfig/adapter/turbo-carto-adapter.js +++ b/lib/models/mapconfig/adapter/turbo-carto-adapter.js @@ -105,7 +105,7 @@ TurboCartoAdapter.prototype._parseCartoCss = function (username, params, layer, context: err.context }; - return callback(null, { error: error }); + return callback(null, { exception: error }); } // Try to continue in the rest of the cases diff --git a/lib/utils/common-headers.js b/lib/utils/common-headers.js index 155a2880..c5b86c6a 100644 --- a/lib/utils/common-headers.js +++ b/lib/utils/common-headers.js @@ -39,7 +39,7 @@ module.exports = function setCommonHeaders (req, res, callback) { getStatTag({ res }, (err, statTag) => { if (err) { - logger.warn({ error: err }, 'Error generating Stat Tag header'); + logger.warn({ exception: err }, 'Error generating Stat Tag header'); } if (statTag) { @@ -99,7 +99,7 @@ function getTemplateHash ({ res }) { try { templateHash = res.locals.mapConfigProvider.getTemplateHash().substring(0, 8); } catch (err) { - logger.warn({ error: err }, 'Error generating Stat Tag header'); + logger.warn({ exception: err }, 'Error generating Stat Tag header'); } return templateHash; diff --git a/lib/utils/logger.js b/lib/utils/logger.js index 5f60708b..0f949858 100644 --- a/lib/utils/logger.js +++ b/lib/utils/logger.js @@ -29,7 +29,7 @@ module.exports = class Logger { serializers: { client_request: requestSerializer, server_response: responseSerializer, - error: errorSerializer + exception: errorSerializer } }; const dest = pino.destination({ sync: false }); // stdout diff --git a/package-lock.json b/package-lock.json index 79f2dcc3..f0772f6a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -814,7 +814,7 @@ "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=" }, "camshaft": { - "version": "github:cartodb/camshaft#a2bc005a0010f174a68d49d7c2f35020404db69e", + "version": "github:cartodb/camshaft#0fde77351f4efef767e758aa1160e22d2ef6e65f", "from": "github:cartodb/camshaft#feature/ch91877/remove-log-aggregation-in-metro", "requires": { "async": "^1.5.2",