attempting to start non existing jobs will now error correctly resolves

terascope#562
jsnoble · Sep 28, 2017 · 28075a1 · 28075a1
1 parent df3fab7
commit 28075a1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/cluster/services/api.js b/lib/cluster/services/api.js
@@ -161,14 +161,14 @@ module.exports = function(context, app, services) {
                         .catch(function(err) {
                             var errMsg = parseError(err);
                             logger.error(`Error: could not start job: ${errMsg}`);
-                            sendError(res, 500, `Could not start job: ${job_id}`);
+                            sendError(res, 500, `Could not start job: ${job_id}, error: ${errMsg}`);
                         });
                 }
             })
             .catch(function(err) {
                 var errMsg = parseError(err);
                 logger.error(errMsg);
-                sendError(res, 500, errMsg)
+                sendError(res, 500, errMsg);
             })
     });
 

diff --git a/lib/cluster/services/jobs.js b/lib/cluster/services/jobs.js
@@ -370,14 +370,18 @@ module.exports = function(context, cluster_service) {
     function startJob(job_id) {
         return getJob(job_id)
             .then(function(job_spec) {
+                if(!job_spec) {
+                    return Promise.reject(`no job for job_id: ${job_id} could be found`);
+                }
                 return ensureAssets(job_spec);
             })
             .then(function(assetIdJob) {
                 return createExecutionContext(assetIdJob);
             })
             .catch(function(err) {
                 var errMsg = parseError(err);
-                logger.error(`could not startJob`, errMsg)
+                logger.error(`could not startJob`, errMsg);
+                return Promise.reject(errMsg);
             });
     }