From e5bf3b6a8ed40aabc1769d0265ebcb6cd068abe4 Mon Sep 17 00:00:00 2001
From: Audrey Hamelers <hamelers@ebi.ac.uk>
Date: Thu, 17 Jun 2021 12:54:53 +0100
Subject: [PATCH] #1185
---
server/ftp-integration/fromFTP-TaggerImport.js | 2 ++
server/job-runner/index.js | 2 +-
server/ncbi-integration/fromNcbi.js | 3 ++-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/ftp-integration/fromFTP-TaggerImport.js b/server/ftp-integration/fromFTP-TaggerImport.js
index a8c3617ad..099563ee5 100644
--- a/server/ftp-integration/fromFTP-TaggerImport.js
+++ b/server/ftp-integration/fromFTP-TaggerImport.js
@@ -48,6 +48,8 @@ const ftp = new Client()
} catch (err) {
errorDevEmail('Tagger Import Cron Job', err)
logger.error(err)
+ close(ftp)
+ throw new Error(err)
}
close(ftp)
},
diff --git a/server/job-runner/index.js b/server/job-runner/index.js
index 1ed238861..f2db5e9f5 100644
--- a/server/job-runner/index.js
+++ b/server/job-runner/index.js
@@ -11,7 +11,7 @@ const checkJobStatus = async (name, logic, ftp) => {
// For local running, skip healthcheck if data center not defined
if (DATA_CENTER) {
// Perform healthcheck
- logger.info(`Running healthcheck`)
+ logger.info(`${name}: Running healthcheck`)
const url = `${internalServiceUrl}/healthcheck?datacenterName=${DATA_CENTER}&ftpExcluded=${
ftp ? 0 : 1
}`
diff --git a/server/ncbi-integration/fromNcbi.js b/server/ncbi-integration/fromNcbi.js
index 77f20ca85..c64f9747c 100644
--- a/server/ncbi-integration/fromNcbi.js
+++ b/server/ncbi-integration/fromNcbi.js
@@ -32,7 +32,8 @@ const ftp = new Client()
`Error during Error email from NCBI process sent ${errEmail}`,
)
}
- logger.error(err)
+ close(ftp)
+ throw new Error(err)
}
close(ftp)
logger.info(
--
GitLab