From 7e976fd3c341c7bc1561b664861538df8989a765 Mon Sep 17 00:00:00 2001 From: Steven Weaver Date: Mon, 14 Jun 2021 17:14:22 -0400 Subject: [PATCH] redirecting meme stdout to progress file; calling status update --- app/hyphyjob.js | 1 + app/meme/meme.sh | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/hyphyjob.js b/app/hyphyjob.js index 5866ac90..7e6cdba2 100644 --- a/app/hyphyjob.js +++ b/app/hyphyjob.js @@ -82,6 +82,7 @@ hyphyJob.prototype.spawn = function() { // No status update could be read, // but this could be due to the job just starting self.log("read progress file, but no data"); + self.onStatusUpdate(data); } }); }); diff --git a/app/meme/meme.sh b/app/meme/meme.sh index 0a5a65cf..da0490a0 100755 --- a/app/meme/meme.sh +++ b/app/meme/meme.sh @@ -22,7 +22,7 @@ export HYPHY_PATH=$HYPHY_PATH trap 'echo "Error" > $STATUS_FILE; exit 1' ERR -echo "mpirun -np $PROCS $HYPHY LIBPATH=$HYPHY_PATH meme --alignment $FN --tree $TREE_FN --code $GENETIC_CODE" -mpirun -np $PROCS $HYPHY LIBPATH=$HYPHY_PATH meme --alignment $FN --tree $TREE_FN --code $GENETIC_CODE +echo "mpirun -np $PROCS $HYPHY LIBPATH=$HYPHY_PATH meme --alignment $FN --tree $TREE_FN --code $GENETIC_CODE >> $PROGRESS_FILE" +mpirun -np $PROCS $HYPHY LIBPATH=$HYPHY_PATH meme --alignment $FN --tree $TREE_FN --code $GENETIC_CODE >> $PROGRESS_FILE echo "Completed" > $STATUS_FILE diff --git a/package.json b/package.json index 3cea4cde..14b55b37 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "datamonkey-js-server", "description": "", - "version": "2.1.1", + "version": "2.1.2", "engines": { "node": ">=13" },