Prevent adding duplicate restart jobs in queue

Author: Lupul

bin/v-restart-cron

@@ -36,11 +36,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi

bin/v-restart-dns

@@ -41,11 +41,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi

bin/v-restart-ftp

@@ -36,11 +36,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi

bin/v-restart-mail

@@ -36,11 +36,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi

bin/v-restart-proxy

@@ -36,11 +36,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi

bin/v-restart-web

@@ -36,11 +36,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi

bin/v-restart-web-backend

@@ -36,11 +36,8 @@ if [ "$1" = "no" ]; then
 fi
 
 # Schedule restart
-if [ "$1" = 'scheduled' ]; then
-    echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
-    exit
-fi
-if [ -z "$1" ] && [ "$SCHEDULED_RESTART" = 'yes' ]; then
+if [ "$1" = 'scheduled' ] || [ -z "$1" -a "$SCHEDULED_RESTART" = 'yes' ]; then
+    sed -i "/$SCRIPT/d" $HESTIA/data/queue/restart.pipe
     echo "$BIN/$SCRIPT now" >> $HESTIA/data/queue/restart.pipe
     exit
 fi