Merge branch 'master' into express-4.x

NEWS.md

@@ -1,7 +1,14 @@
-1.36.2 - 2016-mm-dd
+1.36.3 - 2016-mm-dd
 -------------------
 
 
+1.36.2 - 2016-10-03
+-------------------
+
+Bug fixes:
+ - Batch Queries logs: use path instead of stream to be able to reopen FD.
+
+
 1.36.1 - 2016-09-30
 -------------------
 

batch/batch-logger.js

@@ -1,16 +1,20 @@
 'use strict';
 
 var bunyan = require('bunyan');
-var fs = require('fs');
 
 function BatchLogger (path) {
+    var stream = {
+        level: 'info'
+    };
+    if (path) {
+        stream.path = path;
+    } else {
+        stream.stream = process.stdout;
+    }
     this.path = path;
     this.logger = bunyan.createLogger({
         name: 'batch-queries',
-        streams: [{
-            level: 'info',
-            stream: path ? fs.createWriteStream(path, { flags: 'a', encoding: 'utf8' }) :  process.stdout
-        }]
+        streams: [stream]
     });
 }
 

npm-shrinkwrap.json

@@ -1,6 +1,6 @@
 {
   "name": "cartodb_sql_api",
-  "version": "1.36.2",
+  "version": "1.36.3",
   "dependencies": {
     "body-parser": {
       "version": "1.14.2",

package.json

@@ -5,7 +5,7 @@
   "keywords": [
     "cartodb"
   ],
-  "version": "1.36.2",
+  "version": "1.36.3",
   "repository": {
     "type": "git",
     "url": "git://github.com/CartoDB/CartoDB-SQL-API.git"