From fd056226827181bd35babc397f8f6e327cbdef38 Mon Sep 17 00:00:00 2001
From: Jeremy Nicklas <jnicklas@osc.edu>
Date: Wed, 24 Jan 2018 15:23:03 -0500
Subject: [PATCH] fix job not ending
---
CHANGELOG.md | 2 ++
template/after.sh | 4 +++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 481d555..7e0920c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
## [Unreleased]
+### Fixed
+- Fix job not ending if forked processes still running.
## [1.0.1] - 2018-01-03
### Changed
diff --git a/template/after.sh b/template/after.sh
index 8153a04..b6a344a 100755
--- a/template/after.sh
+++ b/template/after.sh
@@ -3,6 +3,8 @@ echo "Waiting for Jupyter Notebook server to open port ${port}..."
if wait_until_port_used "${host}:${port}" 60; then
echo "Discovered Jupyter Notebook server listening on port ${port}!"
else
- echo "Timed out waiting for Jupyter Notebook server to open port ${port}!" ; exit 1
+ echo "Timed out waiting for Jupyter Notebook server to open port ${port}!"
+ pkill -P ${SCRIPT_PID}
+ clean_up 1
fi
sleep 2
--
GitLab