Merge branch 'master' into one-redis-mpool

.gitignore

@@ -5,3 +5,5 @@ config/environments/*.js
 tools/munin/windshaft.conf
 logs/
 pids/
+redis.pid
+test.log

NEWS.md

@@ -1,7 +1,34 @@
-1.18.1 -- 2014-mm-dd
+1.19.1 -- 2014-mm-dd
 --------------------
 
 
+1.19.0 -- 2014-10-14
+--------------------
+
+Announcements:
+ - Dropping support for npm <1.2.1
+   npm-shrinkwrap.json is incompatible when generated with npm >=1.2.1 and consumed by npm <1.2.1
+ - Upgrades windshaft to 0.28.2
+ - Generates npm-shrinkwrap.json with npm >1.2.0
+
+
+1.18.2 -- 2014-10-13
+--------------------
+
+Bug fixes:
+ - Defaults resultSet to object if undefined in QueryTablesApi
+
+Announcements:
+ - Upgrades windshaft to 0.28.1
+
+
+1.18.1 -- 2014-10-13
+--------------------
+
+New features:
+ - Allow to add more node.js' threadpool workers via process.env.UV_THREADPOOL_SIZE
+
+
 1.18.0 -- 2014-10-03
 --------------------
 

app.js

@@ -38,6 +38,10 @@ log4js_config = {
   replaceConsole:true
 };
 
+if (global.environment.uv_threadpool_size) {
+    process.env.UV_THREADPOOL_SIZE = global.environment.uv_threadpool_size;
+}
+
 if ( global.environment.log_filename ) {
   var logdir = path.dirname(global.environment.log_filename);
   // See cwd inlog4js.configure call below

config/environments/development.js.example

@@ -2,6 +2,7 @@ var config = {
      environment: 'development'
     ,port: 8181
     ,host: '127.0.0.1'
+    ,uv_threadpool_size: undefined
     // Regular expression pattern to extract username
     // from hostname. Must have a single grabbing block.
     ,user_from_host: '^(.*)\\.localhost'

config/environments/production.js.example

@@ -2,6 +2,7 @@ var config = {
     environment: 'production'
     ,port: 8181
     ,host: '127.0.0.1'
+    ,uv_threadpool_size: undefined
     // Regular expression pattern to extract username
     // from hostname. Must have a single grabbing block.
     ,user_from_host: '^(.*)\\.cartodb\\.com$'

config/environments/staging.js.example

@@ -2,6 +2,7 @@ var config = {
     environment: 'production'
     ,port: 8181
     ,host: '127.0.0.1'
+    ,uv_threadpool_size: undefined
     // Regular expression pattern to extract username
     // from hostname. Must have a single grabbing block.
     ,user_from_host: '^(.*)\\.cartodb\\.com$'

config/environments/test.js.example

@@ -2,6 +2,7 @@ var config = {
      environment: 'test'
     ,port: 8888
     ,host: '127.0.0.1'
+    ,uv_threadpool_size: undefined
     // Regular expression pattern to extract username
     // from hostname. Must have a single grabbing block.
     ,user_from_host: '(.*)'

lib/cartodb/api/query_tables_api.js

@@ -93,6 +93,7 @@ function runQuery(username, options, query, queryHandler, callback) {
     if (shouldQueryPostgresDirectly()) {
         var psql = new PSQL(options);
         psql.query(query, function(err, resultSet) {
+            resultSet = resultSet || {};
             var rows = resultSet.rows || [];
             queryHandler(err, rows, callback);
         });

package.json

@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "windshaft-cartodb",
-    "version": "1.18.1",
+    "version": "1.19.1",
     "description": "A map tile server for CartoDB",
     "keywords": [
       "cartodb"
@@ -25,7 +25,7 @@
         "node-varnish": "https://github.com/Vizzuality/node-varnish/tarball/0.3.0",
         "underscore"  : "~1.6.0",
         "dot": "~1.0.2",
-        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.28.0",
+        "windshaft": "https://github.com/CartoDB/Windshaft/tarball/0.28.2",
         "step": "~0.0.5",
         "request": "~2.9.203",
         "cartodb-redis": "https://github.com/CartoDB/node-cartodb-redis/tarball/0.11.0",
@@ -43,5 +43,9 @@
     },
     "scripts": {
         "test": "make check"
+    },
+    "engines": {
+        "node": ">=0.8 <0.11",
+        "npm": ">=1.2.1"
     }
 }