Merge branch 'named-maps-tiles' into standalone-server

Conflicts:
	app.js

NEWS.md

@@ -1,10 +1,43 @@
 # Changelog
 
-## 2.5.1
+## 2.7.1
 
 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
 
 Released 2015-06-18

README.md

@@ -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
 ```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
 ---

config/environments/development.js.example

@@ -96,6 +96,12 @@ var config = {
           // wasted time.
           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
           // around the rendered (meta?)tile.
           //

config/environments/production.js.example

@@ -90,6 +90,12 @@ var config = {
           // wasted time.
           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
           // around the rendered (meta?)tile.
           //

config/environments/staging.js.example

@@ -90,6 +90,12 @@ var config = {
           // wasted time.
           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
           // around the rendered (meta?)tile.
           //

config/environments/test.js.example

@@ -90,6 +90,12 @@ var config = {
           // wasted time.
           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
           // around the rendered (meta?)tile.
           //

lib/cartodb/server.js

@@ -57,7 +57,9 @@ module.exports = function(serverOptions) {
     // Make stats client globally accessible
     global.statsClient = windshaft.stats.Client.getInstance(serverOptions.statsd);
 
-    var redisPool = new RedisPool(_.extend(serverOptions.redis, {name: 'windshaft:server'}));
+    var redisPool = new RedisPool(
+        _.extend(serverOptions.redis, { name: 'windshaft:server', unwatchOnRelease: false, noReadyCheck: true})
+    );
 
     redisPool.on('status', function(status) {
         var keyPrefix = 'windshaft.redis-pool.' + status.name + '.db' + status.db + '.';

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.5.1",
+  "version": "2.7.1",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
@@ -471,9 +471,8 @@
       "resolved": "https://registry.npmjs.org/queue-async/-/queue-async-1.0.7.tgz"
     },
     "redis-mpool": {
-      "version": "0.3.0",
-      "from": "redis-mpool@~0.3.0",
-      "resolved": "https://registry.npmjs.org/redis-mpool/-/redis-mpool-0.3.0.tgz",
+      "version": "0.4.0",
+      "from": "redis-mpool@~0.4.0",
       "dependencies": {
         "generic-pool": {
           "version": "2.1.1",

package.json

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