cartodb/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into named-maps-tiles

Browse Source 
Conflicts:
	npm-shrinkwrap.json
	package.json
This commit is contained in:
Raul Ochoa 2015-07-06 01:32:33 +02:00
commit feec7805af
9 changed files with 103 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
NEWS.md
View File

@ -1,10 +1,43 @@
# Changelog # Changelog
## 2.5.1 ## 2.7.1
Released 2015-mm-dd Released 2015-mm-dd
## 2.7.0
Released 2015-07-03
Announcements:
- Upgrades windshaft to [0.47.0](https://github.com/CartoDB/Windshaft/releases/tag/0.47.0)
- Upgrades redis-mpool to [0.4.0](https://github.com/CartoDB/node-redis-mpool/releases/tag/0.4.0)
New features:
- Exposes redis `noReadyCheck` config
Bug fixes:
- Fixes `unwatchOnRelease` redis config
## 2.6.1
Released 2015-07-02
Announcements:
- Upgrades windshaft to [0.46.1](https://github.com/CartoDB/Windshaft/releases/tag/0.46.1)
## 2.6.0
Released 2015-07-02
Announcements:
- Upgrades windshaft to [0.46.0](https://github.com/CartoDB/Windshaft/releases/tag/0.46.0)
- New config to set metatile by format
## 2.5.0 ## 2.5.0
Released 2015-06-18 Released 2015-06-18

8
README.md
View File

@ -59,6 +59,14 @@ happen to have startup errors you may need to force rebuilding those
modules. At any time just wipe out the node_modules/ directory and run modules. At any time just wipe out the node_modules/ directory and run
```npm install``` again. ```npm install``` again.
Upgrading
---------
Checkout your commit/branch. If you need to reinstall dependencies (you can check [NEWS](NEWS.md)) do the following:
```
rm -rf node_modules; npm install
```
Run Run
--- ---

2
app.js
View File

@ -65,7 +65,7 @@ if ( global.environment.log_filename ) {
global.log4js.configure(log4js_config, { cwd: __dirname }); global.log4js.configure(log4js_config, { cwd: __dirname });
global.logger = global.log4js.getLogger(); global.logger = global.log4js.getLogger();
var redisOpts = _.extend(global.environment.redis, { name: 'windshaft' }), var redisOpts = _.extend(global.environment.redis, { name: 'windshaft', unwatchOnRelease: false, noReadyCheck: true }),
redisPool = new RedisPool(redisOpts); redisPool = new RedisPool(redisOpts);
// Include cartodb_windshaft only _after_ the "global" variable is set // Include cartodb_windshaft only _after_ the "global" variable is set

6
config/environments/development.js.example
View File

@ -96,6 +96,12 @@ var config = {
// wasted time. // wasted time.
metatile: 2, metatile: 2,
// Override metatile behaviour depending on the format
formatMetatile: {
png: 2,
'grid.json': 1
},
// Buffer size is the tickness in pixel of a buffer // Buffer size is the tickness in pixel of a buffer
// around the rendered (meta?)tile. // around the rendered (meta?)tile.
// //

6
config/environments/production.js.example
View File

@ -90,6 +90,12 @@ var config = {
// wasted time. // wasted time.
metatile: 2, metatile: 2,
// Override metatile behaviour depending on the format
formatMetatile: {
png: 2,
'grid.json': 1
},
// Buffer size is the tickness in pixel of a buffer // Buffer size is the tickness in pixel of a buffer
// around the rendered (meta?)tile. // around the rendered (meta?)tile.
// //

6
config/environments/staging.js.example
View File

@ -90,6 +90,12 @@ var config = {
// wasted time. // wasted time.
metatile: 2, metatile: 2,
// Override metatile behaviour depending on the format
formatMetatile: {
png: 2,
'grid.json': 1
},
// Buffer size is the tickness in pixel of a buffer // Buffer size is the tickness in pixel of a buffer
// around the rendered (meta?)tile. // around the rendered (meta?)tile.
// //

6
config/environments/test.js.example
View File

@ -90,6 +90,12 @@ var config = {
// wasted time. // wasted time.
metatile: 2, metatile: 2,
// Override metatile behaviour depending on the format
formatMetatile: {
png: 2,
'grid.json': 1
},
// Buffer size is the tickness in pixel of a buffer // Buffer size is the tickness in pixel of a buffer
// around the rendered (meta?)tile. // around the rendered (meta?)tile.
// //

109
npm-shrinkwrap.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "windshaft-cartodb", "name": "windshaft-cartodb",
"version": "2.5.1", "version": "2.7.1",
"dependencies": { "dependencies": {
"cartodb-psql": { "cartodb-psql": {
"version": "0.4.0", "version": "0.4.0",
@ -180,9 +180,9 @@
"resolved": "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz" "resolved": "https://registry.npmjs.org/qs/-/qs-3.1.0.tgz"
}, },
"tunnel-agent": { "tunnel-agent": {
"version": "0.4.0", "version": "0.4.1",
"from": "tunnel-agent@~0.4.0", "from": "tunnel-agent@~0.4.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz" "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
}, },
"tough-cookie": { "tough-cookie": {
"version": "2.0.0", "version": "2.0.0",
@ -276,19 +276,19 @@
"resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz", "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-1.8.0.tgz",
"dependencies": { "dependencies": {
"bluebird": { "bluebird": {
"version": "2.9.30", "version": "2.9.32",
"from": "bluebird@^2.9.30", "from": "bluebird@^2.9.30",
"resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.30.tgz" "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.32.tgz"
}, },
"chalk": { "chalk": {
"version": "1.0.0", "version": "1.1.0",
"from": "chalk@^1.0.0", "from": "chalk@^1.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz", "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.0.tgz",
"dependencies": { "dependencies": {
"ansi-styles": { "ansi-styles": {
"version": "2.0.1", "version": "2.1.0",
"from": "ansi-styles@^2.0.1", "from": "ansi-styles@^2.1.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz" "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz"
}, },
"escape-string-regexp": { "escape-string-regexp": {
"version": "1.0.3", "version": "1.0.3",
@ -296,38 +296,33 @@
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz" "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz"
}, },
"has-ansi": { "has-ansi": {
"version": "1.0.3", "version": "2.0.0",
"from": "has-ansi@^1.0.3", "from": "has-ansi@^2.0.0",
"resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
"dependencies": { "dependencies": {
"ansi-regex": { "ansi-regex": {
"version": "1.1.1", "version": "2.0.0",
"from": "ansi-regex@^1.1.0", "from": "ansi-regex@^2.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
},
"get-stdin": {
"version": "4.0.1",
"from": "get-stdin@^4.0.1",
"resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"
} }
} }
}, },
"strip-ansi": { "strip-ansi": {
"version": "2.0.1", "version": "3.0.0",
"from": "strip-ansi@^2.0.1", "from": "strip-ansi@^3.0.0",
"resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz",
"dependencies": { "dependencies": {
"ansi-regex": { "ansi-regex": {
"version": "1.1.1", "version": "2.0.0",
"from": "ansi-regex@^1.0.0", "from": "ansi-regex@^2.0.0",
"resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz" "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz"
} }
} }
}, },
"supports-color": { "supports-color": {
"version": "1.3.1", "version": "2.0.0",
"from": "supports-color@^1.3.0", "from": "supports-color@^2.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz" "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"
} }
} }
}, },
@ -442,9 +437,8 @@
"resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.0.7.tgz" "resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.0.7.tgz"
}, },
"redis-mpool": { "redis-mpool": {
"version": "0.3.0", "version": "0.4.0",
"from": "redis-mpool@~0.3.0", "from": "redis-mpool@~0.4.0",
"resolved": "https://registry.npmjs.org/redis-mpool/-/redis-mpool-0.3.0.tgz",
"dependencies": { "dependencies": {
"generic-pool": { "generic-pool": {
"version": "2.1.1", "version": "2.1.1",
@ -481,9 +475,9 @@
"resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz" "resolved": "https://registry.npmjs.org/request/-/request-2.9.203.tgz"
}, },
"step": { "step": {
"version": "0.0.5", "version": "0.0.6",
"from": "step@~0.0.5", "from": "step@~0.0.5",
"resolved": "https://registry.npmjs.org/step/-/step-0.0.5.tgz" "resolved": "https://registry.npmjs.org/step/-/step-0.0.6.tgz"
}, },
"underscore": { "underscore": {
"version": "1.6.0", "version": "1.6.0",
@ -491,7 +485,7 @@
"resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz" "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
}, },
"windshaft": { "windshaft": {
"version": "0.45.1", "version": "0.47.1",
"from": "https://github.com/CartoDB/Windshaft/tarball/backend-foundations", "from": "https://github.com/CartoDB/Windshaft/tarball/backend-foundations",
"resolved": "https://github.com/CartoDB/Windshaft/tarball/backend-foundations", "resolved": "https://github.com/CartoDB/Windshaft/tarball/backend-foundations",
"dependencies": { "dependencies": {
@ -501,44 +495,9 @@
"resolved": "git://github.com/CartoDB/chronographjs.git#0b8c35eee510cfa14a16be24d70533b38ecc1d2d" "resolved": "git://github.com/CartoDB/chronographjs.git#0b8c35eee510cfa14a16be24d70533b38ecc1d2d"
}, },
"grainstore": { "grainstore": {
"version": "0.23.0", "version": "1.0.0",
"from": "grainstore@~0.23.0", "from": "grainstore@~1.0.0",
"resolved": "https://registry.npmjs.org/grainstore/-/grainstore-0.23.0.tgz",
"dependencies": { "dependencies": {
"redis-mpool": {
"version": "0.1.0",
"from": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0",
"resolved": "https://github.com/CartoDB/node-redis-mpool/tarball/0.1.0",
"dependencies": {
"generic-pool": {
"version": "2.1.1",
"from": "generic-pool@~2.1.1",
"resolved": "https://registry.npmjs.org/generic-pool/-/generic-pool-2.1.1.tgz"
},
"redis": {
"version": "0.12.1",
"from": "redis@~0.12.1",
"resolved": "https://registry.npmjs.org/redis/-/redis-0.12.1.tgz"
},
"hiredis": {
"version": "0.1.17",
"from": "hiredis@~0.1.17",
"resolved": "https://registry.npmjs.org/hiredis/-/hiredis-0.1.17.tgz",
"dependencies": {
"bindings": {
"version": "1.2.1",
"from": "bindings@*",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"
},
"nan": {
"version": "1.1.2",
"from": "nan@~1.1.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-1.1.2.tgz"
}
}
}
}
},
"carto": { "carto": {
"version": "0.9.5-cdb2", "version": "0.9.5-cdb2",
"from": "https://github.com/CartoDB/carto/tarball/0.9.5-cdb2", "from": "https://github.com/CartoDB/carto/tarball/0.9.5-cdb2",
@ -2871,9 +2830,9 @@
"resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz" "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz"
}, },
"tunnel-agent": { "tunnel-agent": {
"version": "0.4.0", "version": "0.4.1",
"from": "tunnel-agent@~0.4.0", "from": "tunnel-agent@~0.4.0",
"resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz" "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.1.tgz"
}, },
"tough-cookie": { "tough-cookie": {
"version": "2.0.0", "version": "2.0.0",

4
package.json
View File

@ -1,7 +1,7 @@
{ {
"private": true, "private": true,
"name": "windshaft-cartodb", "name": "windshaft-cartodb",
"version": "2.5.1", "version": "2.7.1",
"description": "A map tile server for CartoDB", "description": "A map tile server for CartoDB",
"keywords": [ "keywords": [
"cartodb" "cartodb"
@ -31,7 +31,7 @@
"cartodb-redis": "~0.13.0", "cartodb-redis": "~0.13.0",
"cartodb-psql": "~0.4.0", "cartodb-psql": "~0.4.0",
"fastly-purge": "~1.0.0", "fastly-purge": "~1.0.0",
"redis-mpool": "~0.3.0", "redis-mpool": "~0.4.0",
"lzma": "~1.3.7", "lzma": "~1.3.7",
"log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb" "log4js": "https://github.com/CartoDB/log4js-node/tarball/cdb"
}, },