Skip to content

Commit a3c4d17

Browse files
author
Yan Xu
committed
Add nextflow path
1 parent d043c22 commit a3c4d17

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

webapp/server/.env.example

+3
Original file line numberDiff line numberDiff line change
@@ -38,3 +38,6 @@ SEND_PROJECT_STATUS_EMAILS=false
3838
PROJECT_STATUS_SUBJECT=Your EDGE project status
3939
EMAIL_MAILGUN_API_KEY="__POPULATE_ME_IF_ENABLING_EMAIL__"
4040
EMAIL_MAILGUN_DOMAIN="__POPULATE_ME_IF_ENABLING_EMAIL__"
41+
42+
# Nextflow
43+
NEXTFLOW_PATH="/PATH/TO/nextflow"

webapp/server/config.js

+1
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ const config = {
7777
BUILD_DIR: process.env.CLIENT_BASE_DIR || path.join(CLIENT_BASE_DIR, 'build'),
7878
},
7979
NEXTFLOW: {
80+
PATH: process.env.NEXTFLOW_PATH || 'nextflow',
8081
// Max allowed number of jobs in nextflow.
8182
NUM_JOBS_MAX: makeIntIfDefined(process.env.NEXTFLOW_NUM_JOBS_MAX) || 100000,
8283
// Total size of the input files allowed per job.

webapp/server/utils/nextflow.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const submitWorkflow = async (proj, projectConf, inputsize) => {
4444
}
4545
// submit workflow
4646
const runName = `edge-${proj.code}`;
47-
const cmd = `cd ${workDir}; nextflow -c ${projHome}/nextflow.config -bg -q run ${config.NEXTFLOW.WORKFLOW_DIR}/${workflowList[projectConf.workflow.name].nextflow_main} -name ${runName}`;
47+
const cmd = `cd ${workDir}; ${config.NEXTFLOW.PATH} -c ${projHome}/nextflow.config -bg -q run ${config.NEXTFLOW.WORKFLOW_DIR}/${workflowList[projectConf.workflow.name].nextflow_main} -name ${runName}`;
4848
write2log(log, 'Run pipeline');
4949
// Don't need to wait for the command to complete. It may take long time to finish and cause an error.
5050
// The updateJobStatus will catch the error if this command failed.
@@ -148,7 +148,7 @@ const updateJobStatus = async (job, proj) => {
148148
// get job status
149149
const projHome = `${config.IO.PROJECT_BASE_DIR}/${proj.code}`;
150150
// Pipeline status. Possible values are: OK, ERR and empty
151-
let cmd = `cd ${projHome}/nextflow; nextflow log|awk '/${job.id}/ &&(/OK/||/ERR/)'|awk '{split($0,array,/\t/); print array[4]}'`;
151+
let cmd = `cd ${projHome}/nextflow; ${config.NEXTFLOW.PATH} log|awk '/${job.id}/ &&(/OK/||/ERR/)'|awk '{split($0,array,/\t/); print array[4]}'`;
152152
let ret = await execCmd(cmd);
153153

154154
if (!ret || ret.code !== 0) {
@@ -177,7 +177,7 @@ const updateJobStatus = async (job, proj) => {
177177
}
178178

179179
// Task status. Possible values are: COMPLETED, FAILED, and ABORTED.
180-
cmd = `cd ${projHome}/nextflow; nextflow log ${job.id} -f status`;
180+
cmd = `cd ${projHome}/nextflow; ${config.NEXTFLOW.PATH} log ${job.id} -f status`;
181181
ret = await execCmd(cmd);
182182
if (!ret || ret.code !== 0) {
183183
// command failed

0 commit comments

Comments
 (0)