From 8773b6d9314aab56f24c404a6dd30c83bb3768c2 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Thu, 17 May 2018 16:30:06 +0200 Subject: [PATCH] Silence lock wrapper if script is still running Signed-off-by: Patrick Uiterwijk --- roles/base/files/common-scripts/lock-wrapper | 2 - .../basessh/files/common-scripts/lock-wrapper | 41 ------------------- 2 files changed, 43 deletions(-) delete mode 100755 roles/basessh/files/common-scripts/lock-wrapper diff --git a/roles/base/files/common-scripts/lock-wrapper b/roles/base/files/common-scripts/lock-wrapper index f990f635eb..955be7ff10 100755 --- a/roles/base/files/common-scripts/lock-wrapper +++ b/roles/base/files/common-scripts/lock-wrapper @@ -22,8 +22,6 @@ if ! mkdir "$LOCKDIR"; then PID=$(cat "$PIDFILE") if [ -n "$PID" ] && /bin/ps $PID > /dev/null then - echo "$PID is still running" - /bin/ps -o user,pid,start,time,comm $PID exit 1; else echo "$LOCKDIR exists but $PID is dead" diff --git a/roles/basessh/files/common-scripts/lock-wrapper b/roles/basessh/files/common-scripts/lock-wrapper deleted file mode 100755 index f990f635eb..0000000000 --- a/roles/basessh/files/common-scripts/lock-wrapper +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/bash - -if [ $# -lt 2 ]; then - echo "Usage: $0 [name] [script]" - exit 1; -fi - -NAME=$1 -SCRIPT=$2 - -LOCKDIR="/var/tmp/$NAME" -PIDFILE="$LOCKDIR/pid" - -function cleanup { - rm -rf "$LOCKDIR" -} - -RESTORE_UMASK=$(umask -p) -umask 0077 -if ! mkdir "$LOCKDIR"; then - echo "$LOCKDIR already exists" - PID=$(cat "$PIDFILE") - if [ -n "$PID" ] && /bin/ps $PID > /dev/null - then - echo "$PID is still running" - /bin/ps -o user,pid,start,time,comm $PID - exit 1; - else - echo "$LOCKDIR exists but $PID is dead" - echo "Removing lockdir and re-running" - /bin/rm -rf $LOCKDIR - mkdir $LOCKDIR || exit - fi -fi - -trap cleanup EXIT SIGQUIT SIGHUP SIGTERM -echo $$ > "$PIDFILE" - -$RESTORE_UMASK -eval "$SCRIPT" -