From b3bbb6af0195464c10d7ec6c019c0b6bb911a244 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Mon, 4 Jul 2016 18:40:11 +0200
Subject: [PATCH] Include error message in node status endpoint

---
 lib/cartodb/backends/analysis-status.js | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/cartodb/backends/analysis-status.js b/lib/cartodb/backends/analysis-status.js
index 211157d8..97f851d2 100644
--- a/lib/cartodb/backends/analysis-status.js
+++ b/lib/cartodb/backends/analysis-status.js
@@ -9,7 +9,10 @@ module.exports = AnalysisStatusBackend;
 AnalysisStatusBackend.prototype.getNodeStatus = function (params, callback) {
     var nodeId = params.nodeId;
 
-    var statusQuery = 'SELECT node_id, status, updated_at FROM cdb_analysis_catalog where node_id = \'' + nodeId + '\'';
+    var statusQuery = [
+        'SELECT node_id, status, updated_at, last_error_message as error_message',
+        'FROM cdb_analysis_catalog where node_id = \'' + nodeId + '\''
+    ].join(' ');
 
     var pg = new PSQL(dbParamsFromReqParams(params));
     pg.query(statusQuery, function(err, result) {
@@ -21,10 +24,16 @@ AnalysisStatusBackend.prototype.getNodeStatus = function (params, callback) {
 
         var rows = result.rows || [];
 
-        return callback(null, rows[0] || {
+        var statusResponse = rows[0] || {
             node_id: nodeId,
             status: 'unknown'
-        });
+        };
+
+        if (statusResponse.status !== 'failed') {
+            delete statusResponse.error_message;
+        }
+
+        return callback(null, statusResponse);
     }, true); // use read-only transaction
 };