From b7286fc90ddc203ec0e8fee80e4840173dc5ccdb Mon Sep 17 00:00:00 2001
From: David Glasser <glasser@meteor.com>
Date: Thu, 5 Jan 2017 13:11:01 -0800
Subject: [PATCH] Make deploy errors easier to identify

---
 tools/meteor-services/deploy.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tools/meteor-services/deploy.js b/tools/meteor-services/deploy.js
index f6768614fd..ac594ddbf3 100644
--- a/tools/meteor-services/deploy.js
+++ b/tools/meteor-services/deploy.js
@@ -59,8 +59,6 @@ const CAPABILITIES = ['showDeployMessages', 'canTransferAuthorization'];
 //   body, or a generic 'try again later' message, as appropriate
 
 var deployRpc = function (options) {
-  var genericError = "Server error (please try again later)";
-
   options = _.clone(options);
   options.headers = _.clone(options.headers || {});
   if (options.headers.cookie) {
@@ -96,7 +94,12 @@ var deployRpc = function (options) {
   var ret = { statusCode: response.statusCode };
 
   if (response.statusCode !== 200) {
-    ret.errorMessage = body.length > 0 ? body : genericError;
+    if (body.length > 0) {
+      ret.errorMessage = body;
+    } else {
+      ret.errorMessage = "Server error " + response.statusCode +
+        " (please try again later)";
+    }
     return ret;
   }
 
@@ -105,7 +108,9 @@ var deployRpc = function (options) {
     try {
       ret.payload = JSON.parse(body);
     } catch (e) {
-      ret.errorMessage = genericError;
+      ret.errorMessage =
+        "Server error (please try again later)\n"
+        + "Invalid JSON: " + body;
       return ret;
     }
   } else if (contentType === "text/plain; charset=utf-8") {
@@ -123,7 +128,8 @@ var deployRpc = function (options) {
     delete ret.payload;
     delete ret.message;
 
-    ret.errorMessage = genericError;
+    ret.errorMessage = "Server error (please try again later)\n" +
+      "Response missing expected keys.";
   }
 
   return ret;