Merge pull request #227 from yungwine/mytonctrl2_dev

fix set_node_argument

Author: igroman787

mytoninstaller/mytoninstaller.py

@@ -134,16 +134,6 @@ def Status(local, args):
 #end define
 
 
-def restart_node():
-	exit_code = run_as_root(["systemctl", "daemon-reload"])
-	if exit_code:
-		raise Exception(f"`systemctl daemon-reload` failed with exit code {exit_code}")
-	exit_code = run_as_root(["systemctl", "restart", "validator"])
-	if exit_code:
-		raise Exception(f"`systemctl restart validator` failed with exit code {exit_code}")
-#end define
-
-
 def set_node_argument(local, args):
 	if len(args) < 1:
 		color_print("{red}Bad args. Usage:{endc} set_node_argument <arg-name> [arg-value] [-d (to delete)]")
@@ -157,7 +147,6 @@ def set_node_argument(local, args):
 			set_node_arg(arg_name, None)
 		else:
 			set_node_arg(arg_name, arg_value)
-	restart_node()
 	color_print("set_node_argument - {green}OK{endc}")
 #end define
 

mytoninstaller/node_args.py

@@ -1,16 +1,19 @@
+from mypylib.mypylib import run_as_root
 
 
 def get_validator_service():
     path = '/etc/systemd/system/validator.service'
     with open(path, 'r') as f:
         return f.read()
+#end define
 
 
 def get_node_start_command():
     service = get_validator_service()
     for line in service.split('\n'):
         if 'ExecStart' in line:
             return line.split('=')[1].strip()
+#end define
 
 
 def get_node_args(command: str = None):
@@ -29,6 +32,17 @@ def get_node_args(command: str = None):
     if key:
         result[key] = ''
     return result
+#end define
+
+
+def restart_node():
+    exit_code = run_as_root(["systemctl", "daemon-reload"])
+    if exit_code:
+        raise Exception(f"`systemctl daemon-reload` failed with exit code {exit_code}")
+    exit_code = run_as_root(["systemctl", "restart", "validator"])
+    if exit_code:
+        raise Exception(f"`systemctl restart validator` failed with exit code {exit_code}")
+#end define
 
 
 def set_node_arg(arg_name: str, arg_value: str = ''):
@@ -49,5 +63,7 @@ def set_node_arg(arg_name: str, arg_value: str = ''):
         args[arg_name] = arg_value
     new_command = command.split(' ')[0] + ' ' + ' '.join([f'{k} {v}' for k, v in args.items()])
     new_service = service.replace(command, new_command)
-    with open('/etc/systemd/system/validator.service', 'w') as f:
-        f.write(new_service)
+    c = f"with open('/etc/systemd/system/validator.service', 'w') as f: f.write('''{new_service}''')"
+    run_as_root(['python3', '-c', f'"{c}"'])
+    restart_node()
+#end define