From 7a02019b2252147dfdf93cba627aff77c46482d9 Mon Sep 17 00:00:00 2001 From: Jared Noble Date: Thu, 28 Sep 2017 11:11:17 -0700 Subject: [PATCH] attempting to start non existing jobs will now error correctly resolves #562 --- lib/cluster/services/api.js | 4 ++-- lib/cluster/services/jobs.js | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/lib/cluster/services/api.js b/lib/cluster/services/api.js index 19cb6eab90b..e3d4486ab52 100644 --- 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 index 1bf5bf9e6f2..111c0ec94ef 100644 --- a/lib/cluster/services/jobs.js +++ b/lib/cluster/services/jobs.js @@ -370,6 +370,9 @@ 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) { @@ -377,7 +380,8 @@ module.exports = function(context, cluster_service) { }) .catch(function(err) { var errMsg = parseError(err); - logger.error(`could not startJob`, errMsg) + logger.error(`could not startJob`, errMsg); + return Promise.reject(errMsg); }); }