Ver Fonte

fix(backup): fix backup not correctly exiting on cancelling backup (#3197)

* backup lock file only gets created when compression starts

* fix backup not correctly exiting on canceling backup
Daniel Gibbs há 5 anos atrás
pai
commit
a194f3c8de
1 ficheiros alterados com 3 adições e 1 exclusões
  1. 3 1
      lgsm/functions/command_backup.sh

+ 3 - 1
lgsm/functions/command_backup.sh

@@ -24,6 +24,8 @@ fn_backup_trap(){
 	fn_script_log_info "Backup ${backupname}.tar.gz: REMOVED"
 	# Remove lock file.
 	rm -f "${lockdir:?}/backup.lock"
+	fn_backup_start_server
+	unset exitbypass
 	core_exit.sh
 }
 
@@ -252,12 +254,12 @@ fn_backup_start_server(){
 }
 
 # Run functions.
-fn_backup_check_lockfile
 fn_backup_create_lockfile
 fn_backup_init
 fn_backup_stop_server
 fn_backup_dir
 fn_backup_migrate_olddir
+fn_backup_check_lockfile
 fn_backup_compression
 fn_backup_prune
 fn_backup_start_server