Fixing lockfile checks for rsync handler

diff --git a/handlers/rsync.in b/handlers/rsync.in
index 21e4ab2c550a113431ffd152f2ecf257b9b6fd6d..cf304ed6660e8892ab1bb0f1f60ec0968dc8cc40 100644 (file)
--- a/handlers/rsync.in
+++ b/handlers/rsync.in
@@ -847,7 +847,13 @@ function test_connect {
 function set_lockfile {
 
   if [ ! -z "$lockfile" ]; then
-    $touch $lockfile || warning "Could not create lockfile $lockfile"
+    mkdir -p `dirname $lockfile`
+    if ( set -o noclobber; echo "$$" > "$lockfile" ) &> /dev/null; then
+      trap 'rm -f "$lockfile"' INT TERM EXIT
+    else
+      info "Could not create lockfile $lockfile, exiting"
+      exit
+    fi
   fi
 
 }
@@ -860,6 +866,23 @@ function unset_lockfile {
 
 }
 
+function check_lockfile {
+
+  local pid
+
+  if [ ! -z "$lockfile" ] && [ -f "$lockfile" ]; then
+    pid="`cat $lockfile`"
+    if ps $pid &> /dev/null; then
+      info "Another backup is running for $lockfile, skipping run"
+      exit
+    else
+      info "Found old lockfile $lockfile, removing it"
+      unset_lockfile  
+    fi
+  fi
+
+}
+
 function set_filelist {
 
   filelist_flag=""
@@ -1045,6 +1068,7 @@ function end_mux {
 # the backup procedure
 
 eval_config
+check_lockfile
 set_lockfile
 set_rsync_options
 start_mux