move backups to separate module

Author: yungwine

modules/__init__.py

@@ -59,8 +59,8 @@ class Setting:
     'subscribe_tg_channel': Setting('validator', False, 'Disables warning about subscribing to the `TON STATUS` channel'),
     'BotToken': Setting('alert-bot', None, 'Alerting Telegram bot token'),
     'ChatId': Setting('alert-bot', None, 'Alerting Telegram chat id'),
-    'auto_backup': Setting('validator', True, 'Make backup of validator every election'),
-    'auto_backup_path': Setting('validator', '/tmp/mytoncore/backups/', 'Path to store backups'),
+    'auto_backup': Setting('validator', None, 'Make validator backup every election'),
+    'auto_backup_path': Setting('validator', '/tmp/mytoncore/auto_backups/', 'Path to store auto-backups'),
 }
 
 

modules/backups.py

@@ -0,0 +1,58 @@
+import pkg_resources
+
+from modules.module import MtcModule
+from mypylib.mypylib import color_print, ip2int, run_as_root
+from mytoninstaller.config import get_own_ip
+
+
+class BackupModule(MtcModule):
+
+    def create_backup(self, args):
+        if len(args) > 2:
+            color_print("{red}Bad args. Usage:{endc} create_backup [path_to_archive] [-y]")
+            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'))
+        command_args = ["-m", self.ton.local.buffer.my_work_dir]
+        if len(args) == 1:
+            command_args += ["-d", args[0]]
+        backup_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/create_backup.sh')
+        if run_as_root(["bash", backup_script_path] + command_args) == 0:
+            color_print("create_backup - {green}OK{endc}")
+        else:
+            color_print("create_backup - {red}Error{endc}")
+    # end define
+
+    def restore_backup(self, args):
+        if len(args) == 0 or len(args) > 2:
+            color_print("{red}Bad args. Usage:{endc} restore_backup <path_to_archive> [-y]")
+            return
+        if '-y' not in args:
+            res = input(
+                f'This action will overwrite existing configuration with contents of backup archive, please make sure that donor node is not in operation prior to this action. Proceed [y/n]')
+            if res.lower() != 'y':
+                print('aborted.')
+                return
+        else:
+            args.pop(args.index('-y'))
+        print('Before proceeding, mtc will create a backup of current configuration.')
+        self.create_backup(['-y'])
+        ip = str(ip2int(get_own_ip()))
+        command_args = ["-m", self.ton.local.buffer.my_work_dir, "-n", args[0], "-i", ip]
+
+        restore_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/restore_backup.sh')
+        if run_as_root(["bash", restore_script_path] + command_args) == 0:
+            color_print("restore_backup - {green}OK{endc}")
+            self.local.exit()
+        else:
+            color_print("restore_backup - {red}Error{endc}")
+    # end define
+
+    def add_console_commands(self, console):
+        console.AddItem("create_backup", self.create_backup, self.local.translate("create_backup_cmd"))
+        console.AddItem("restore_backup", self.restore_backup, self.local.translate("restore_backup_cmd"))

mytoncore/mytoncore.py

@@ -1476,16 +1476,21 @@ def clear_tmp(self):
 	def make_backup(self, election_id: str):
 		if not self.local.db.get("auto_backup"):
 			return
-		from mytonctrl.mytonctrl import create_backup
+		from modules.backups import BackupModule
+		module = BackupModule(self, self.local)
 		args = []
 		name = f"/mytonctrl_backup_elid{election_id}.zip"
 		backups_dir = self.tempDir + "/auto_backups"
 		if self.local.db.get("auto_backup_path"):
 			backups_dir = self.local.db.get("auto_backup_path")
-		os.makedirs(self.tempDir + "/auto_backups", exist_ok=True)
+		os.makedirs(backups_dir, exist_ok=True)
 		args.append(backups_dir + name)
 		self.clear_dir(backups_dir)
-		create_backup(self.local, self, args + ['-y'])
+		exit_code = module.create_backup(args + ['-y'])
+		if exit_code != 0:
+			self.local.add_log(f"Backup failed with exit code {exit_code}", "error")
+		else:
+			self.local.add_log(f"Backup created successfully", "info")
 
 	def GetValidatorKeyByTime(self, startWorkTime, endWorkTime):
 		self.local.add_log("start GetValidatorKeyByTime function", "debug")

mytonctrl/mytonctrl.py

@@ -85,15 +85,17 @@ def inject_globals(func):
 	console.AddItem("get", inject_globals(GetSettings), local.translate("get_cmd"))
 	console.AddItem("set", inject_globals(SetSettings), local.translate("set_cmd"))
 	console.AddItem("rollback", inject_globals(rollback_to_mtc1), local.translate("rollback_cmd"))
-	console.AddItem("create_backup", inject_globals(create_backup), local.translate("create_backup_cmd"))
-	console.AddItem("restore_backup", inject_globals(restore_backup), local.translate("restore_backup_cmd"))
 
 	#console.AddItem("xrestart", inject_globals(Xrestart), local.translate("xrestart_cmd"))
 	#console.AddItem("xlist", inject_globals(Xlist), local.translate("xlist_cmd"))
 	#console.AddItem("gpk", inject_globals(GetPubKey), local.translate("gpk_cmd"))
 	#console.AddItem("ssoc", inject_globals(SignShardOverlayCert), local.translate("ssoc_cmd"))
 	#console.AddItem("isoc", inject_globals(ImportShardOverlayCert), local.translate("isoc_cmd"))
 
+	from modules.backups import BackupModule
+	module = BackupModule(ton, local)
+	module.add_console_commands(console)
+
 	from modules.custom_overlays import CustomOverlayModule
 	module = CustomOverlayModule(ton, local)
 	module.add_console_commands(console)
@@ -939,53 +941,6 @@ def disable_mode(local, ton, args):
 #end define
 
 
-def create_backup(local, ton, args):
-	if len(args) > 2:
-		color_print("{red}Bad args. Usage:{endc} create_backup [path_to_archive] [-y]")
-		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'))
-	command_args = ["-m", ton.local.buffer.my_work_dir]
-	if len(args) == 1:
-		command_args += ["-d", args[0]]
-	backup_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/create_backup.sh')
-	if run_as_root(["bash", backup_script_path] + command_args) == 0:
-		color_print("create_backup - {green}OK{endc}")
-	else:
-		color_print("create_backup - {red}Error{endc}")
-#end define
-
-
-def restore_backup(local, ton, args):
-	if len(args) == 0 or len(args) > 2:
-		color_print("{red}Bad args. Usage:{endc} restore_backup <path_to_archive> [-y]")
-		return
-	if '-y' not in args:
-		res = input(f'This action will overwrite existing configuration with contents of backup archive, please make sure that donor node is not in operation prior to this action. Proceed [y/n]')
-		if res.lower() != 'y':
-			print('aborted.')
-			return
-	else:
-		args.pop(args.index('-y'))
-	print('Before proceeding, mtc will create a backup of current configuration.')
-	create_backup(local, ton, ['-y'])
-	ip = str(ip2int(get_own_ip()))
-	command_args = ["-m", ton.local.buffer.my_work_dir, "-n", args[0], "-i", ip]
-
-	restore_script_path = pkg_resources.resource_filename('mytonctrl', 'scripts/restore_backup.sh')
-	if run_as_root(["bash", restore_script_path] + command_args) == 0:
-		color_print("restore_backup - {green}OK{endc}")
-		local.exit()
-	else:
-		color_print("restore_backup - {red}Error{endc}")
-#end define
-
-
 def Xrestart(inputArgs):
 	if len(inputArgs) < 2:
 		color_print("{red}Bad args. Usage:{endc} xrestart <timestamp> <args>")