Suppress trap for SIGUSR1 signal #1656

nextflow-io · Jul 13, 2020 · da6580a · da6580a
1 parent dbbc97e
commit da6580a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/modules/nextflow/src/main/resources/nextflow/executor/command-run.txt b/modules/nextflow/src/main/resources/nextflow/executor/command-run.txt
@@ -99,7 +99,7 @@ nxf_unstage() {
 
 nxf_main() {
     trap on_exit EXIT
-    trap on_term TERM INT USR1 USR2
+    trap on_term TERM INT USR2
 
     [[ "${NXF_CHDIR:-}" ]] && cd "$NXF_CHDIR"
     {{container_boxid}}
@@ -131,4 +131,4 @@ nxf_main() {
     {{after_script}}
 }
 
-$NXF_ENTRY
+$NXF_ENTRY
diff --git a/modules/nextflow/src/test/groovy/nextflow/executor/test-bash-wrapper-with-trace.txt b/modules/nextflow/src/test/groovy/nextflow/executor/test-bash-wrapper-with-trace.txt
@@ -264,7 +264,7 @@ nxf_unstage() {
 
 nxf_main() {
     trap on_exit EXIT
-    trap on_term TERM INT USR1 USR2
+    trap on_term TERM INT USR2
 
     [[ "${NXF_CHDIR:-}" ]] && cd "$NXF_CHDIR"
     NXF_SCRATCH=''

diff --git a/modules/nextflow/src/test/groovy/nextflow/executor/test-bash-wrapper.txt b/modules/nextflow/src/test/groovy/nextflow/executor/test-bash-wrapper.txt
@@ -75,7 +75,7 @@ nxf_unstage() {
 
 nxf_main() {
     trap on_exit EXIT
-    trap on_term TERM INT USR1 USR2
+    trap on_term TERM INT USR2
 
     [[ "${NXF_CHDIR:-}" ]] && cd "$NXF_CHDIR"
     NXF_SCRATCH=''

diff --git a/modules/nf-google/src/test/nextflow/cloud/google/lifesciences/bash-wrapper-gcp.txt b/modules/nf-google/src/test/nextflow/cloud/google/lifesciences/bash-wrapper-gcp.txt
@@ -79,7 +79,7 @@ nxf_unstage() {
 
 nxf_main() {
     trap on_exit EXIT
-    trap on_term TERM INT USR1 USR2
+    trap on_term TERM INT USR2
 
     [[ "${NXF_CHDIR:-}" ]] && cd "$NXF_CHDIR"
     NXF_SCRATCH={{folder}}