Merge branch 'master' into express-4.x

NEWS.md

@@ -1,7 +1,14 @@
-1.36.1 - 2016-mm-dd
+1.36.2 - 2016-mm-dd
 -------------------
 
 
+1.36.1 - 2016-09-30
+-------------------
+
+Enhancements:
+ * Tag fallback jobs logs.
+
+
 1.36.0 - 2016-09-30
 -------------------
 

batch/models/job_fallback.js

@@ -220,7 +220,7 @@ JobFallback.prototype.log = function(logger) {
     for (var i = 0; i < queries.length; i++) {
         var query = queries[i];
 
-        var output = {
+        var logEntry = {
             time: query.started_at,
             endtime: query.ended_at,
             username: this.data.user,
@@ -230,18 +230,20 @@ JobFallback.prototype.log = function(logger) {
 
         var queryId = query.id;
 
+        var tag = 'query';
         if (queryId) {
-            output.query_id = queryId;
+            logEntry.query_id = queryId;
 
             var node = parseQueryId(queryId);
             if (node) {
-                output.analysis = node.analysisId;
-                output.node = node.nodeId;
-                output.type = node.nodeType;
+                logEntry.analysis = node.analysisId;
+                logEntry.node = node.nodeId;
+                logEntry.type = node.nodeType;
+                tag = 'analysis';
             }
         }
 
-        logger.info(output);
+        logger.info(logEntry, tag);
     }
 
     return true;

npm-shrinkwrap.json

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

package.json

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