Release 2.12.0

Upgrades windshaft to 0.51.0

NEWS.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## 2.12.0
+
+Released 2015-08-27
+
+Announcements:
+ - Upgrades windshaft to [0.51.0](https://github.com/CartoDB/Windshaft/releases/tag/0.51.0)
+
+New features:
+ - Make http and https globalAgent options configurable
+   * If config is not provided it configures them with default values
+
+
+## 2.11.0
+
+Released 2015-08-26
+
+Announcements:
+ - Upgrades windshaft to [0.50.0](https://github.com/CartoDB/Windshaft/releases/tag/0.50.0)
+
+
 ## 2.10.0
 
 Released 2015-08-18

app.js

@@ -9,6 +9,8 @@
 
 var path = require('path');
 var fs = require('fs');
+var http = require('http');
+var https = require('https');
 var RedisPool = require('redis-mpool');
 var _ = require('underscore');
 
@@ -72,6 +74,17 @@ var redisOpts = _.defaults(global.environment.redis, {
 });
 var redisPool = new RedisPool(redisOpts);
 
+// set global HTTP and HTTPS agent default configurations
+// ref https://nodejs.org/api/http.html#http_new_agent_options
+var agentOptions = _.defaults(global.environment.httpAgent || {}, {
+    keepAlive: false,
+    keepAliveMsecs: 1000,
+    maxSockets: Infinity,
+    maxFreeSockets: 256
+});
+http.globalAgent = new http.Agent(agentOptions);
+https.globalAgent = new https.Agent(agentOptions);
+
 // Include cartodb_windshaft only _after_ the "global" variable is set
 // See https://github.com/Vizzuality/Windshaft-cartodb/issues/28
 var cartodbWindshaft = require('./lib/cartodb/cartodb_windshaft'),
@@ -106,10 +119,10 @@ ws.listen(global.environment.port, global.environment.host);
 var version = require("./package").version;
 
 ws.on('listening', function() {
-  console.log(
-      "Windshaft tileserver %s started on %s:%s (%s)",
-      version, global.environment.host, global.environment.port, ENV
-  );
+    console.log(
+        "Windshaft tileserver %s started on %s:%s PID=%d (%s)",
+        version, global.environment.host, global.environment.port, process.pid, ENV
+    );
 });
 
 process.on('SIGHUP', function() {

config/environments/development.js.example

@@ -196,6 +196,13 @@ var config = {
         unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161
         noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading
     }
+    // For more details about this options check https://nodejs.org/api/http.html#http_new_agent_options
+    ,httpAgent: {
+        keepAlive: true,
+        keepAliveMsecs: 1000,
+        maxSockets: 25,
+        maxFreeSockets: 256
+    }
     ,varnish: {
         host: 'localhost',
         port: 6082, // the por for the telnet interface where varnish is listening to

config/environments/production.js.example

@@ -190,6 +190,13 @@ var config = {
         unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161
         noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading
     }
+    // For more details about this options check https://nodejs.org/api/http.html#http_new_agent_options
+    ,httpAgent: {
+        keepAlive: true,
+        keepAliveMsecs: 1000,
+        maxSockets: 25,
+        maxFreeSockets: 256
+    }
     ,varnish: {
         host: 'localhost',
         port: 6082, // the por for the telnet interface where varnish is listening to

config/environments/staging.js.example

@@ -190,6 +190,13 @@ var config = {
         unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161
         noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading
     }
+    // For more details about this options check https://nodejs.org/api/http.html#http_new_agent_options
+    ,httpAgent: {
+        keepAlive: true,
+        keepAliveMsecs: 1000,
+        maxSockets: 25,
+        maxFreeSockets: 256
+    }
     ,varnish: {
         host: 'localhost',
         port: 6082, // the por for the telnet interface where varnish is listening to

config/environments/test.js.example

@@ -192,6 +192,13 @@ var config = {
         unwatchOnRelease: false, // Send unwatch on release, see http://github.com/CartoDB/Windshaft-cartodb/issues/161
         noReadyCheck: true // Check `no_ready_check` at https://github.com/mranney/node_redis/tree/v0.12.1#overloading
     }
+    // For more details about this options check https://nodejs.org/api/http.html#http_new_agent_options
+    ,httpAgent: {
+        keepAlive: true,
+        keepAliveMsecs: 1000,
+        maxSockets: 25,
+        maxFreeSockets: 256
+    }
     ,varnish: {
         host: '',
         port: null, // the por for the telnet interface where varnish is listening to

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "windshaft-cartodb",
-  "version": "2.10.0",
+  "version": "2.12.0",
   "dependencies": {
     "cartodb-psql": {
       "version": "0.4.0",
@@ -76,9 +76,9 @@
       "from": "fastly-purge@~1.0.0",
       "dependencies": {
         "request": {
-          "version": "2.60.0",
+          "version": "2.61.0",
           "from": "request@^2.55.0",
-          "resolved": "https://registry.npmjs.org/request/-/request-2.60.0.tgz",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.61.0.tgz",
           "dependencies": {
             "bl": {
               "version": "1.0.0",
@@ -156,14 +156,14 @@
               "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"
             },
             "mime-types": {
-              "version": "2.1.4",
+              "version": "2.1.5",
               "from": "mime-types@~2.1.2",
-              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.4.tgz",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.5.tgz",
               "dependencies": {
                 "mime-db": {
-                  "version": "1.16.0",
-                  "from": "mime-db@~1.16.0",
-                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.16.0.tgz"
+                  "version": "1.17.0",
+                  "from": "mime-db@~1.17.0",
+                  "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.17.0.tgz"
                 }
               }
             },
@@ -279,9 +279,9 @@
                   "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-2.9.34.tgz"
                 },
                 "chalk": {
-                  "version": "1.1.0",
+                  "version": "1.1.1",
                   "from": "chalk@^1.0.0",
-                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.0.tgz",
+                  "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz",
                   "dependencies": {
                     "ansi-styles": {
                       "version": "2.1.0",
@@ -408,7 +408,7 @@
             },
             "inherits": {
               "version": "2.0.1",
-              "from": "inherits@2"
+              "from": "inherits@~2.0.1"
             }
           }
         },
@@ -483,9 +483,9 @@
       "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"
     },
     "windshaft": {
-      "version": "0.49.0",
-      "from": "windshaft@0.49.0",
-      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.49.0.tgz",
+      "version": "0.51.0",
+      "from": "windshaft@0.51.0",
+      "resolved": "https://registry.npmjs.org/windshaft/-/windshaft-0.51.0.tgz",
       "dependencies": {
         "chronograph": {
           "version": "0.1.0",
@@ -2707,14 +2707,14 @@
           }
         },
         "canvas": {
-          "version": "1.2.1",
-          "from": "canvas@1.2.1",
-          "resolved": "https://registry.npmjs.org/canvas/-/canvas-1.2.1.tgz",
+          "version": "1.2.7-cdb1",
+          "from": "https://github.com/CartoDB/node-canvas/tarball/1.2.7-cdb1",
+          "resolved": "https://github.com/CartoDB/node-canvas/tarball/1.2.7-cdb1",
           "dependencies": {
             "nan": {
-              "version": "1.5.3",
-              "from": "nan@~1.5.1",
-              "resolved": "https://registry.npmjs.org/nan/-/nan-1.5.3.tgz"
+              "version": "1.9.0",
+              "from": "nan@^1.8.4",
+              "resolved": "https://registry.npmjs.org/nan/-/nan-1.9.0.tgz"
             }
           }
         },

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "2.10.0",
+    "version": "2.12.0",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -24,7 +24,7 @@
     "dependencies": {
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "0.49.0",
+        "windshaft": "0.51.0",
         "step": "~0.0.5",
         "queue-async": "~1.0.7",
         "request": "~2.9.203",