remove mytoncore restart from backup, remove -y flag

Author: yungwine

modules/backups.py

@@ -27,16 +27,9 @@ def create_tmp_ton_dir(self):
         return dir_name
 
     def create_backup(self, args):
-        if len(args) > 2:
-            color_print("{red}Bad args. Usage:{endc} create_backup [filename] [-y]")
+        if len(args) > 1:
+            color_print("{red}Bad args. Usage:{endc} create_backup [filename]")
             return
-        if '-y' not in args:
-            res = input(f'Mytoncore service will be stopped for few seconds while backup is created, Proceed [y/n]?')
-            if res.lower() != 'y':
-                print('aborted.')
-                return
-        else:
-            args.pop(args.index('-y'))
         dir_ = self.create_tmp_ton_dir()
         command_args = ["-m", self.ton.local.buffer.my_work_dir, "-t", dir_]
         if len(args) == 1:
@@ -64,7 +57,7 @@ def restore_backup(self, args):
         else:
             args.pop(args.index('-y'))
         print('Before proceeding, mtc will create a backup of current configuration.')
-        self.create_backup(['-y'])
+        self.create_backup([])
         ip = str(ip2int(get_own_ip()))
         command_args = ["-m", self.ton.local.buffer.my_work_dir, "-n", args[0], "-i", ip]
 

mytoncore/mytoncore.py

@@ -1486,7 +1486,7 @@ def make_backup(self, election_id: str):
 		os.makedirs(backups_dir, exist_ok=True)
 		args.append(backups_dir + name)
 		self.clear_dir(backups_dir)
-		exit_code = module.create_backup(args + ['-y'])
+		exit_code = module.create_backup(args)
 		if exit_code != 0:
 			self.local.add_log(f"Backup failed with exit code {exit_code}", "error")
 		else:

mytonctrl/scripts/create_backup.sh

@@ -20,12 +20,7 @@ done
 COLOR='\033[92m'
 ENDC='\033[0m'
 
-systemctl stop mytoncore
-
-echo -e "${COLOR}[1/4]${ENDC} Stopped mytoncore service"
-
-
-tmp_dir="/tmp/mytoncore/backup"
+tmp_dir="/tmp/mytoncore/backupv2"
 rm -rf $tmp_dir
 mkdir $tmp_dir
 mkdir $tmp_dir/db
@@ -36,16 +31,15 @@ cp -r $keys_dir ${tmp_dir}
 cp -r $mtc_dir $tmp_dir
 
 python3 -c "import json;f=open('${tmp_dir}/db/config.json');json.load(f);f.close()" || exit 1  # Check if config.json is copied correctly
+python3 -c "import json;f=open('${tmp_dir}/mytoncore/mytoncore.db');json.load(f);f.close()" || exit 2  # Check if mytoncore.db is copied correctly
 
-echo -e "${COLOR}[2/4]${ENDC} Copied files to ${tmp_dir}"
-
-systemctl start mytoncore
+echo -e "${COLOR}[1/3]${ENDC} Copied files to ${tmp_dir}"
 
-echo -e "${COLOR}[3/4]${ENDC} Started mytoncore service"
+echo -e "${COLOR}[2/3]${ENDC} Started mytoncore service"
 
 tar -zcf $dest -C $tmp_dir .
 
 chown $user:$user $dest
 
-echo -e "${COLOR}[4/4]${ENDC} Backup successfully created in ${dest}!"
+echo -e "${COLOR}[3/3]${ENDC} Backup successfully created in ${dest}!"
 echo -e "If you wish to use archive package to migrate node to different machine please make sure to stop validator and mytoncore on donor (this) host prior to migration."