add and fix locking

diff --git a/bin/release-delayed-messages b/bin/release-delayed-messages
index 61abd85bc6b310229009acd3e124152a27c67d6f..cdb6da4198e524e54436e14af3848df1b8b03a8e 100755 (executable)
--- a/bin/release-delayed-messages
+++ b/bin/release-delayed-messages
@@ -5,5 +5,14 @@ DELAYED_QUEUE=$HOME/.maildir/.delayed
 
 DIR="${0%/*}"
 
 
 DIR="${0%/*}"
 

+VAR=$HOME/.var/procmail
+ME="${0##*/}"
+LOCKFILE="$VAR/.$ME.lock"
+trap "rm -f $LOCKFILE" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+if ! lockfile -0 -r0 -l 3600 "$LOCKFILE" 2>/dev/null; then
+  echo "E: another $ME process is already running over that Maildir." >&2
+  exit 1
+fi
+

 "$DIR"/list-postponed-messages --all "$DELAYED_QUEUE" \
   | exec xargs "$DIR"/resubmit --list
 "$DIR"/list-postponed-messages --all "$DELAYED_QUEUE" \
   | exec xargs "$DIR"/resubmit --list

diff --git a/bin/resubmit-postponed-messages b/bin/resubmit-postponed-messages
index 1ea3100688d54b539ac342a13cad83da77ecb907..df5663e33dbf26cc4dcb4efa47e26aa4e3f19a82 100755 (executable)
--- a/bin/resubmit-postponed-messages
+++ b/bin/resubmit-postponed-messages
@@ -6,5 +6,14 @@ TICKLER_QUEUE=$HOME/.maildir/.store
 
 DIR="${0%/*}"
 
 
 DIR="${0%/*}"
 

+VAR=$HOME/.var/procmail
+ME="${0##*/}"
+LOCKFILE="$VAR/.$ME.lock"
+trap "rm -f $LOCKFILE" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+if ! lockfile -0 -r0 -l 3600 "$LOCKFILE" 2>/dev/null; then
+  echo "E: another $ME process is already running over that Maildir." >&2
+  exit 1
+fi
+

 "$DIR"/list-postponed-messages "$TICKLER_QUEUE" "$DELAYED_QUEUE" \
   | exec xargs "$DIR"/resubmit --list
 "$DIR"/list-postponed-messages "$TICKLER_QUEUE" "$DELAYED_QUEUE" \
   | exec xargs "$DIR"/resubmit --list

diff --git a/bin/retrain b/bin/retrain
index 784f17ea262a6ca9853b8fe9373166c8e353e081..e7acbea8a15bb6176d491757088c0a8def6462b9 100755 (executable)
--- a/bin/retrain
+++ b/bin/retrain
@@ -49,10 +49,11 @@ case "$HAM/$SPAM" in
 esac
 
 if [ -n "$maildir" ]; then
 esac
 
 if [ -n "$maildir" ]; then

-  LOCKFILE="$maildir/.retrain.lock"
+  ME="${0##*/}"
+  LOCKFILE="$maildir/.$ME.lock"

   trap "rm -f $LOCKFILE" 1 2 3 4 5 6 7 8 10 11 12 13 14 15
   if ! lockfile -0 -r0 -l 3600 "$LOCKFILE" 2>/dev/null; then
   trap "rm -f $LOCKFILE" 1 2 3 4 5 6 7 8 10 11 12 13 14 15
   if ! lockfile -0 -r0 -l 3600 "$LOCKFILE" 2>/dev/null; then

-    echo "E: another retrain process is already running over that Maildir." >&2
+    echo "E: another $ME process is already running over that Maildir." >&2

     exit 1
   fi
 
     exit 1
   fi
 

diff --git a/bin/send-outgoing b/bin/send-outgoing
index 244218fdf848d774495fc216c76ab4f874f9225d..1d5f80007829cd974cc813af4b95bc96ad7a0162 100755 (executable)
--- a/bin/send-outgoing
+++ b/bin/send-outgoing
@@ -7,10 +7,11 @@ DISCARD_RECORD=~/.maildir/.discard
 
 DONT_STORE=1
 
 
 DONT_STORE=1
 

-LOCKFILE="$OUTBOX/.sendmail.lock"
+ME="${0##*/}"
+LOCKFILE="$OUTBOX/.$ME.lock"

 trap "rm -f $LOCKFILE" 1 2 3 4 5 6 7 8 10 11 12 13 14 15
 if ! lockfile -0 -r0 -l 3600 "$LOCKFILE" 2>/dev/null; then
 trap "rm -f $LOCKFILE" 1 2 3 4 5 6 7 8 10 11 12 13 14 15
 if ! lockfile -0 -r0 -l 3600 "$LOCKFILE" 2>/dev/null; then

-  echo "E: another sendmail process is already running over that Maildir." >&2
+  echo "E: another $ME process is already running over that Maildir." >&2

   exit 1
 fi
 
   exit 1
 fi