Ver código fonte

Ensure restart flag is used

Kristan Kenney 5 anos atrás
pai
commit
b6ada1da1e
2 arquivos alterados com 4 adições e 3 exclusões
  1. 1 1
      bin/v-add-cron-job
  2. 3 2
      bin/v-delete-cron-job

+ 1 - 1
bin/v-add-cron-job

@@ -84,7 +84,7 @@ sync_cron_jobs
 increase_user_value $user '$U_CRON_JOBS'
 increase_user_value $user '$U_CRON_JOBS'
 
 
 # Restarting crond
 # Restarting crond
-$BIN/v-restart-cron
+$BIN/v-restart-cron $restart
 check_result $? "Cron restart failed" >/dev/null
 check_result $? "Cron restart failed" >/dev/null
 
 
 # Logging
 # Logging

+ 3 - 2
bin/v-delete-cron-job

@@ -15,6 +15,7 @@
 # Argument definition
 # Argument definition
 user=$1
 user=$1
 job=$2
 job=$2
+restart=$3
 
 
 # Includes
 # Includes
 # shellcheck source=/usr/local/hestia/func/main.sh
 # shellcheck source=/usr/local/hestia/func/main.sh
@@ -27,7 +28,7 @@ source $HESTIA/conf/hestia.conf
 #                    Verifications                         #
 #                    Verifications                         #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
-check_args '2' "$#" 'USER JOB'
+check_args '2' "$#" 'USER JOB [RESTART]'
 is_format_valid 'user' 'job'
 is_format_valid 'user' 'job'
 is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
 is_system_enabled "$CRON_SYSTEM" 'CRON_SYSTEM'
 is_object_valid 'user' 'USER' "$user"
 is_object_valid 'user' 'USER' "$user"
@@ -65,7 +66,7 @@ if [ ! -z "$suspended" ]; then
 fi
 fi
 
 
 # Restarting crond
 # Restarting crond
-$BIN/v-restart-cron
+$BIN/v-restart-cron $restart
 check_result $? "Restart restart failed" >/dev/null
 check_result $? "Restart restart failed" >/dev/null
 
 
 # Logging
 # Logging