From 06e68c15188badb7d42f4b6974c1558f399c4b0c Mon Sep 17 00:00:00 2001 From: Luis Bosque Date: Tue, 23 Jul 2013 19:43:32 +0200 Subject: [PATCH 1/8] Target v1.3.4 --- NEWS.md | 3 +++ package.json | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 92fd58fc..5406ba14 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,6 @@ +1.3.4 +------ + 1.3.3 ------ * Set Last-Modified header to allow for 304 responses diff --git a/package.json b/package.json index b6a9a535..46890eae 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "private": true, "name": "windshaft-cartodb", - "version": "1.3.3", + "version": "1.3.4", "description": "A map tile server for CartoDB", "url": "https://github.com/CartoDB/Windshaft-cartodb", "licenses": [{ From 60617e7641b5c22540f0a69bcc34f353f4b3b7ab Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 13 Aug 2013 13:01:25 +0200 Subject: [PATCH 2/8] Upgrade windshaft to improve CSS error messages --- NEWS.md | 2 ++ npm-shrinkwrap.json | 14 +++++++------- package.json | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/NEWS.md b/NEWS.md index 5406ba14..60c3858f 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,7 @@ 1.3.4 ------ +* Improve empty CartoCSS error message +* Improve invalid mapnik-geometry-type CSS error message 1.3.3 ------ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 9e6de77d..1b91d7e9 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -1,6 +1,6 @@ { "name": "windshaft-cartodb", - "version": "1.3.3", + "version": "1.3.4", "dependencies": { "node-varnish": { "version": "0.1.1" @@ -9,10 +9,10 @@ "version": "1.3.3" }, "windshaft": { - "version": "0.13.1", + "version": "0.13.2", "dependencies": { "grainstore": { - "version": "0.13.6", + "version": "0.13.7", "dependencies": { "carto": { "version": "0.9.3-cdb3", @@ -69,13 +69,13 @@ "version": "0.2.20" }, "zipfile": { - "version": "0.3.4" + "version": "0.4.0" }, "sqlite3": { - "version": "2.1.14" + "version": "2.1.15" }, "mime": { - "version": "1.2.9" + "version": "1.2.10" }, "mkdirp": { "version": "0.3.5" @@ -130,7 +130,7 @@ "version": "0.1.0" }, "mime": { - "version": "1.2.9" + "version": "1.2.10" }, "sphericalmercator": { "version": "1.0.2" diff --git a/package.json b/package.json index 46890eae..a6516ef7 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "dependencies": { "node-varnish": "0.1.1", "underscore" : "~1.3.3", - "windshaft" : "~0.13.1", + "windshaft" : "~0.13.2", "step": "0.0.x", "generic-pool": "~2.0.3", "redis": "~0.8.3", From db951234aa8cc7585c721503dee9c5fad3ab9363 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 21 Aug 2013 10:04:43 +0200 Subject: [PATCH 3/8] Add note about cache dir need to be writable by server user As per https://groups.google.com/d/msg/cartodb/z06r9SwaoOM/b34In4TTdd0J --- config/environments/development.js.example | 1 + config/environments/production.js.example | 1 + config/environments/staging.js.example | 1 + config/environments/test.js.example | 1 + 4 files changed, 4 insertions(+) diff --git a/config/environments/development.js.example b/config/environments/development.js.example index 7a3aaad8..795ab70b 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -36,6 +36,7 @@ var config = { bufferSize: 64 } ,millstone: { + // Needs to be writable by server user cache_basedir: '/tmp/cdb-tiler-dev/millstone-dev' } ,redis: { diff --git a/config/environments/production.js.example b/config/environments/production.js.example index c80d46f2..8a07f3b4 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -30,6 +30,7 @@ var config = { bufferSize: 64 } ,millstone: { + // Needs to be writable by server user cache_basedir: '/home/ubuntu/tile_assets/' } ,redis: { diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index bdf31fc5..fad74159 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -30,6 +30,7 @@ var config = { bufferSize: 64 } ,millstone: { + // Needs to be writable by server user cache_basedir: '/home/ubuntu/tile_assets/' } ,redis: { diff --git a/config/environments/test.js.example b/config/environments/test.js.example index a6761972..7cc84c13 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -30,6 +30,7 @@ var config = { bufferSize: 64 } ,millstone: { + // Needs to be writable by server user cache_basedir: '/tmp/cdb-tiler-test/millstone' } ,redis: { From 633e8d164b74419ddd9f20d7da50d2ec30911388 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 21 Aug 2013 10:11:30 +0200 Subject: [PATCH 4/8] Rename sqlapi.host configuration to sqlapi.domain. Closes #79. Support for "host" is retained for backward compatibility. --- NEWS.md | 4 ++++ config/environments/development.js.example | 2 +- config/environments/production.js.example | 2 +- config/environments/staging.js.example | 2 +- config/environments/test.js.example | 2 +- lib/cartodb/server_options.js | 5 ++++- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/NEWS.md b/NEWS.md index 60c3858f..00c883b9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,9 @@ 1.3.4 ------ + +NOTE: configuration sqlapi.host renamed to sqlapi.domain + (support for "sqlapi.host" is retained for backward compatibility) + * Improve empty CartoCSS error message * Improve invalid mapnik-geometry-type CSS error message diff --git a/config/environments/development.js.example b/config/environments/development.js.example index 795ab70b..32bbcde7 100644 --- a/config/environments/development.js.example +++ b/config/environments/development.js.example @@ -55,7 +55,7 @@ var config = { } ,sqlapi: { protocol: 'http', - host: 'localhost.lan', + domain: 'localhost.lan', port: 8080, version: 'v1' } diff --git a/config/environments/production.js.example b/config/environments/production.js.example index 8a07f3b4..1cc96b8b 100644 --- a/config/environments/production.js.example +++ b/config/environments/production.js.example @@ -49,7 +49,7 @@ var config = { } ,sqlapi: { protocol: 'https', - host: 'cartodb.com', + domain: 'cartodb.com', port: 8080, version: 'v2' } diff --git a/config/environments/staging.js.example b/config/environments/staging.js.example index fad74159..39cd1ebb 100644 --- a/config/environments/staging.js.example +++ b/config/environments/staging.js.example @@ -49,7 +49,7 @@ var config = { } ,sqlapi: { protocol: 'https', - host: 'cartodb.com', + domain: 'cartodb.com', port: 8080, version: 'v2' } diff --git a/config/environments/test.js.example b/config/environments/test.js.example index 7cc84c13..69452e0a 100644 --- a/config/environments/test.js.example +++ b/config/environments/test.js.example @@ -49,7 +49,7 @@ var config = { } ,sqlapi: { protocol: 'http', - host: '', + domain: '', // This port will be used by "make check" for testing purposes // It must be available port: 1080, diff --git a/lib/cartodb/server_options.js b/lib/cartodb/server_options.js index 9957bf8a..14a06cc7 100644 --- a/lib/cartodb/server_options.js +++ b/lib/cartodb/server_options.js @@ -8,6 +8,9 @@ var _ = require('underscore') , LZMA = require('lzma/lzma_worker.js').LZMA ; +// This is for backward compatibility with 1.3.3 +if ( ! global.environment.sqlapi.domain ) global.environment.sqlapi.host; + module.exports = function(){ var rendererConfig = _.defaults(global.environment.renderer || {}, { @@ -62,7 +65,7 @@ module.exports = function(){ var api = global.environment.sqlapi; // build up api string - var sqlapi = api.protocol + '://' + username + '.' + api.host + ':' + api.port + '/api/' + api.version + '/sql' + var sqlapi = api.protocol + '://' + username + '.' + api.domain + ':' + api.port + '/api/' + api.version + '/sql' var qs = { q: sql } From efc6d5c8574894205f6b01e944ee4f3011c16402 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 21 Aug 2013 10:50:49 +0200 Subject: [PATCH 5/8] Fix config/environments/test.js Makefile rule --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 10028828..219efc1f 100644 --- a/Makefile +++ b/Makefile @@ -6,8 +6,8 @@ all: clean: rm -rf node_modules/* -config/environments/test.js: config/environments/test.js.example - ./configure +config/environments/test.js: config/environments/test.js.example Makefile + ./configure --environment=test check-local: config/environments/test.js ./run_tests.sh ${RUNTESTFLAGS} \ From 602b255ce54a1c8ac0a378621a4a67d6a1f77b6f Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Tue, 3 Sep 2013 18:15:37 +0200 Subject: [PATCH 6/8] Upgrade to latest windshaft for more stable test results --- Makefile | 2 +- npm-shrinkwrap.json | 14 +++++++------- package.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 219efc1f..485a5904 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,7 @@ check-local: config/environments/test.js check-submodules: PATH="$$PATH:$(srcdir)/node_modules/.bin/"; \ for sub in windshaft grainstore node-varnish mapnik; do \ - test -e node_modules/$${sub} && make -C node_modules/$${sub} check; \ + test -e node_modules/$${sub} && make -C node_modules/$${sub} check || exit 1; \ done check-full: check-local check-submodules diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 1b91d7e9..80818410 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -9,7 +9,7 @@ "version": "1.3.3" }, "windshaft": { - "version": "0.13.2", + "version": "0.13.3", "dependencies": { "grainstore": { "version": "0.13.7", @@ -26,7 +26,7 @@ "version": "0.1.14", "dependencies": { "sax": { - "version": "0.5.4" + "version": "0.5.5" } } } @@ -75,7 +75,7 @@ "version": "2.1.15" }, "mime": { - "version": "1.2.10" + "version": "1.2.11" }, "mkdirp": { "version": "0.3.5" @@ -124,13 +124,13 @@ }, "tilelive-mapnik": { "version": "0.5.0", - "from": "git://github.com/Vizzuality/tilelive-mapnik.git#6a360ee50", + "from": "git://github.com/Vizzuality/tilelive-mapnik.git#5908346", "dependencies": { "eio": { - "version": "0.1.0" + "version": "0.2.1" }, "mime": { - "version": "1.2.10" + "version": "1.2.11" }, "sphericalmercator": { "version": "1.0.2" @@ -138,7 +138,7 @@ } }, "lru-cache": { - "version": "2.3.0" + "version": "2.3.1" } } }, diff --git a/package.json b/package.json index a6516ef7..9ff6e770 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "dependencies": { "node-varnish": "0.1.1", "underscore" : "~1.3.3", - "windshaft" : "~0.13.2", + "windshaft" : "~0.13.3", "step": "0.0.x", "generic-pool": "~2.0.3", "redis": "~0.8.3", From 27eaad932a9d176fd2d738271d836f6d4ed62510 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 4 Sep 2013 17:56:17 +0200 Subject: [PATCH 7/8] Fix race condition in localization of external resources --- NEWS.md | 1 + npm-shrinkwrap.json | 90 ++++++++++++++++++++++++++++++++++++++------- package.json | 2 +- 3 files changed, 79 insertions(+), 14 deletions(-) diff --git a/NEWS.md b/NEWS.md index 00c883b9..f03836ac 100644 --- a/NEWS.md +++ b/NEWS.md @@ -6,6 +6,7 @@ NOTE: configuration sqlapi.host renamed to sqlapi.domain * Improve empty CartoCSS error message * Improve invalid mapnik-geometry-type CSS error message +* Fix race condition in localization of network resources 1.3.3 ------ diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 80818410..90c65f87 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -9,10 +9,10 @@ "version": "1.3.3" }, "windshaft": { - "version": "0.13.3", + "version": "0.13.4", "dependencies": { "grainstore": { - "version": "0.13.7", + "version": "0.13.8", "dependencies": { "carto": { "version": "0.9.3-cdb3", @@ -36,19 +36,75 @@ "version": "5.0.4" }, "millstone": { - "version": "0.5.15", + "version": "0.6.0-cdb1", + "from": "git://github.com/CartoDB/millstone.git#cdb-0.6.0-cdb1", "dependencies": { - "generic-pool": { - "version": "1.0.12" + "underscore": { + "version": "1.5.1" }, "request": { - "version": "2.11.4", + "version": "2.26.0", "dependencies": { + "qs": { + "version": "0.6.5" + }, + "json-stringify-safe": { + "version": "5.0.0" + }, + "forever-agent": { + "version": "0.5.0" + }, + "tunnel-agent": { + "version": "0.3.0" + }, + "http-signature": { + "version": "0.10.0", + "dependencies": { + "assert-plus": { + "version": "0.1.2" + }, + "asn1": { + "version": "0.1.11" + }, + "ctype": { + "version": "0.5.2" + } + } + }, + "hawk": { + "version": "1.0.0", + "dependencies": { + "hoek": { + "version": "0.9.1" + }, + "boom": { + "version": "0.4.2" + }, + "cryptiles": { + "version": "0.2.2" + }, + "sntp": { + "version": "0.2.4" + } + } + }, + "aws-sign": { + "version": "0.3.0" + }, + "oauth-sign": { + "version": "0.3.0" + }, + "cookie-jar": { + "version": "0.3.0" + }, + "node-uuid": { + "version": "1.4.1" + }, "form-data": { - "version": "0.0.3", + "version": "0.1.1", "dependencies": { "combined-stream": { - "version": "0.0.3", + "version": "0.0.4", "dependencies": { "delayed-stream": { "version": "0.0.5" @@ -56,17 +112,14 @@ } }, "async": { - "version": "0.1.9" + "version": "0.2.9" } } - }, - "mime": { - "version": "1.2.7" } } }, "srs": { - "version": "0.2.20" + "version": "0.3.2" }, "zipfile": { "version": "0.4.0" @@ -79,6 +132,17 @@ }, "mkdirp": { "version": "0.3.5" + }, + "optimist": { + "version": "0.6.0", + "dependencies": { + "wordwrap": { + "version": "0.0.2" + }, + "minimist": { + "version": "0.0.2" + } + } } } } diff --git a/package.json b/package.json index 9ff6e770..041768d3 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "dependencies": { "node-varnish": "0.1.1", "underscore" : "~1.3.3", - "windshaft" : "~0.13.3", + "windshaft" : "~0.13.4", "step": "0.0.x", "generic-pool": "~2.0.3", "redis": "~0.8.3", From 17fc934aa347b9db81f413f73481d460b9a0f948 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 4 Sep 2013 18:19:09 +0200 Subject: [PATCH 8/8] Fix check-submodules rule not to fail if a submodule is missing --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 485a5904..6ba8b587 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,10 @@ check-local: config/environments/test.js check-submodules: PATH="$$PATH:$(srcdir)/node_modules/.bin/"; \ for sub in windshaft grainstore node-varnish mapnik; do \ - test -e node_modules/$${sub} && make -C node_modules/$${sub} check || exit 1; \ + if test -e node_modules/$${sub}; then \ + echo "Testing submodule $${sub}"; \ + make -C node_modules/$${sub} check || exit 1; \ + fi; \ done check-full: check-local check-submodules