From b5b808544447efaf0fc330f7fb4fa90ea64c0e42 Mon Sep 17 00:00:00 2001 From: Raul Ochoa Date: Thu, 14 Apr 2016 13:40:02 +0200 Subject: [PATCH] Reformat for better indentation --- lib/cartodb/server_options.js | 106 +++++++++++++++++----------------- 1 file changed, 53 insertions(+), 53 deletions(-) diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index e22f7dee..00011356 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -3,7 +3,7 @@ var _ = require('underscore'); var OverviewsQueryRewriter = require('./utils/overviews_query_rewriter'); var overviewsQueryRewriter = new OverviewsQueryRewriter({ - zoom_level: 'CDB_ZoomFromScale(!scale_denominator!)' + zoom_level: 'CDB_ZoomFromScale(!scale_denominator!)' }); var rendererConfig = _.defaults(global.environment.renderer || {}, { @@ -24,8 +24,8 @@ rendererConfig.mapnik.queryRewriter = overviewsQueryRewriter; // Perform keyword substitution in statsd // See https://github.com/CartoDB/Windshaft-cartodb/issues/153 -if ( global.environment.statsd ) { - if ( global.environment.statsd.prefix ) { +if (global.environment.statsd) { + if (global.environment.statsd.prefix) { var host_token = os.hostname().split('.').reverse().join('.'); global.environment.statsd.prefix = global.environment.statsd.prefix.replace(/:host/, host_token); } @@ -36,61 +36,61 @@ module.exports = { port: global.environment.port, host: global.environment.host }, - // This is for inline maps and table maps - base_url: global.environment.base_url_legacy || '/tiles/:table', + // This is for inline maps and table maps + base_url: global.environment.base_url_legacy || '/tiles/:table', - /// @deprecated with Windshaft-0.17.0 - ///base_url_notable: '/tiles', + /// @deprecated with Windshaft-0.17.0 + ///base_url_notable: '/tiles', - // This is for Detached maps - // - // "maps" is the official, while - // "tiles/layergroup" is for backward compatibility up to 1.6.x - // - base_url_mapconfig: global.environment.base_url_detached || '(?:/maps|/tiles/layergroup)', + // This is for Detached maps + // + // "maps" is the official, while + // "tiles/layergroup" is for backward compatibility up to 1.6.x + // + base_url_mapconfig: global.environment.base_url_detached || '(?:/maps|/tiles/layergroup)', - base_url_templated: global.environment.base_url_templated || '(?:/maps/named|/tiles/template)', + base_url_templated: global.environment.base_url_templated || '(?:/maps/named|/tiles/template)', - grainstore: { - map: { + grainstore: { + map: { // TODO: allow to specify in configuration srid: 3857 - }, - datasource: global.environment.postgres, - cachedir: global.environment.millstone.cache_basedir, - mapnik_version: global.environment.mapnik_version, - mapnik_tile_format: global.environment.mapnik_tile_format || 'png', - default_layergroup_ttl: global.environment.mapConfigTTL || 7200 }, - statsd: global.environment.statsd, - renderCache: { - ttl: rendererConfig.cache_ttl, - statsInterval: rendererConfig.statsInterval - }, - renderer: { - mapnik: _.defaults(rendererConfig.mapnik, { - geojson: { - dbPoolParams: { - size: 16, - idleTimeout: 3000, - reapInterval: 1000 - }, - clipByBox2d: false - } - }), - torque: rendererConfig.torque, - http: rendererConfig.http - }, - // Do not send unwatch on release. See http://github.com/CartoDB/Windshaft-cartodb/issues/161 - redis: _.extend(global.environment.redis, {unwatchOnRelease: false}), - enable_cors: global.environment.enable_cors, - varnish_host: global.environment.varnish.host, - varnish_port: global.environment.varnish.port, - varnish_http_port: global.environment.varnish.http_port, - varnish_secret: global.environment.varnish.secret, - varnish_purge_enabled: global.environment.varnish.purge_enabled, - fastly: global.environment.fastly || {}, - cache_enabled: global.environment.cache_enabled, - log_format: global.environment.log_format, - useProfiler: global.environment.useProfiler + datasource: global.environment.postgres, + cachedir: global.environment.millstone.cache_basedir, + mapnik_version: global.environment.mapnik_version, + mapnik_tile_format: global.environment.mapnik_tile_format || 'png', + default_layergroup_ttl: global.environment.mapConfigTTL || 7200 + }, + statsd: global.environment.statsd, + renderCache: { + ttl: rendererConfig.cache_ttl, + statsInterval: rendererConfig.statsInterval + }, + renderer: { + mapnik: _.defaults(rendererConfig.mapnik, { + geojson: { + dbPoolParams: { + size: 16, + idleTimeout: 3000, + reapInterval: 1000 + }, + clipByBox2d: false + } + }), + torque: rendererConfig.torque, + http: rendererConfig.http + }, + // Do not send unwatch on release. See http://github.com/CartoDB/Windshaft-cartodb/issues/161 + redis: _.extend(global.environment.redis, {unwatchOnRelease: false}), + enable_cors: global.environment.enable_cors, + varnish_host: global.environment.varnish.host, + varnish_port: global.environment.varnish.port, + varnish_http_port: global.environment.varnish.http_port, + varnish_secret: global.environment.varnish.secret, + varnish_purge_enabled: global.environment.varnish.purge_enabled, + fastly: global.environment.fastly || {}, + cache_enabled: global.environment.cache_enabled, + log_format: global.environment.log_format, + useProfiler: global.environment.useProfiler };