From f236f8d2d07aceac9f24f35afaf2e35d3982a6e1 Mon Sep 17 00:00:00 2001 From: haviv Date: Mon, 16 Jan 2017 08:33:58 +0200 Subject: [PATCH 1/2] fix kill process and remove files --- scripts/stop.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/stop.sh b/scripts/stop.sh index 5461caf9..9bccef5d 100755 --- a/scripts/stop.sh +++ b/scripts/stop.sh @@ -4,12 +4,13 @@ set -e TEMP_DIR="/tmp" PYTHON_FILE_SERVER_ROOT=${TEMP_DIR}/python-simple-http-webserver -PID_FILE="server.pid" -PID=`cat ${PYTHON_FILE_SERVER_ROOT}/${PID_FILE}` +ctx logger info "Shutting down 'python -m SimpleHTTPServer' process" +pkill -9 -f 'python -m SimpleHTTPServer' -ctx logger info "Shutting down file server. pid = ${PID}" -kill -9 ${PID} || exit $? +ctx logger info "Deleting all files from hte server " -ctx logger info "Deleting file server root directory (${PYTHON_FILE_SERVER_ROOT})" -rm -rf ${PYTHON_FILE_SERVER_ROOT} +pushd /tmp + shopt -s extglob + rm -rf -- !(task-*|*.socket) +popd From 1f4aaf32b53e18aa4aa0338c9977461ec8755abe Mon Sep 17 00:00:00 2001 From: haviv Date: Mon, 16 Jan 2017 09:57:29 +0200 Subject: [PATCH 2/2] fix remove tmp --- scripts/stop.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/scripts/stop.sh b/scripts/stop.sh index 9bccef5d..c01ca1ba 100755 --- a/scripts/stop.sh +++ b/scripts/stop.sh @@ -8,9 +8,5 @@ PYTHON_FILE_SERVER_ROOT=${TEMP_DIR}/python-simple-http-webserver ctx logger info "Shutting down 'python -m SimpleHTTPServer' process" pkill -9 -f 'python -m SimpleHTTPServer' -ctx logger info "Deleting all files from hte server " - -pushd /tmp - shopt -s extglob - rm -rf -- !(task-*|*.socket) -popd +ctx logger info "Deleting file server root directory (${PYTHON_FILE_SERVER_ROOT})" +rm -rf ${PYTHON_FILE_SERVER_ROOT} \ No newline at end of file