Merge pull request #153 from proppy/add-error-handling

datastore/request: add API error handling
googleapis · Aug 30, 2014 · d539bf0 · d539bf0
2 parents bac5d90 + f06a4b1
commit d539bf0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/common/util.js b/lib/common/util.js
@@ -149,7 +149,11 @@ function handleResp(err, resp, body, callback) {
     return;
   }
   if (resp && (resp.statusCode < 200 || resp.statusCode > 299)) {
-    callback(new Error('error during request, statusCode: ' + resp.statusCode));
+    var error = 'error during request, statusCode: ' + resp.statusCode;
+    if (body) {
+      error += ', body: ' + body;
+    }
+    callback(new Error(error));
     return;
   }
   callback(null, body, resp);

diff --git a/lib/datastore/transaction.js b/lib/datastore/transaction.js
@@ -446,7 +446,13 @@ Transaction.prototype.makeReq = function(method, req, respType, callback) {
         buffer = Buffer.concat([buffer, chunk]);
       });
       resp.on('end', function() {
-        callback(null, respType.decode(buffer));
+        util.handleResp(null, resp, buffer.toString(), function(err) {
+          if (err) {
+            callback(err);
+            return;
+          }
+          callback(null, respType.decode(buffer));        
+        });
       });
     });
     remoteStream.on('error', callback);