Skip to content

Commit b74141d

Browse files
committed
fix set_node_argument
1 parent 9aa9041 commit b74141d

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

mytoninstaller/mytoninstaller.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -134,16 +134,6 @@ def Status(local, args):
134134
#end define
135135

136136

137-
def restart_node():
138-
exit_code = run_as_root(["systemctl", "daemon-reload"])
139-
if exit_code:
140-
raise Exception(f"`systemctl daemon-reload` failed with exit code {exit_code}")
141-
exit_code = run_as_root(["systemctl", "restart", "validator"])
142-
if exit_code:
143-
raise Exception(f"`systemctl restart validator` failed with exit code {exit_code}")
144-
#end define
145-
146-
147137
def set_node_argument(local, args):
148138
if len(args) < 1:
149139
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):
157147
set_node_arg(arg_name, None)
158148
else:
159149
set_node_arg(arg_name, arg_value)
160-
restart_node()
161150
color_print("set_node_argument - {green}OK{endc}")
162151
#end define
163152

mytoninstaller/node_args.py

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1+
from mypylib.mypylib import run_as_root
12

23

34
def get_validator_service():
45
path = '/etc/systemd/system/validator.service'
56
with open(path, 'r') as f:
67
return f.read()
8+
#end define
79

810

911
def get_node_start_command():
1012
service = get_validator_service()
1113
for line in service.split('\n'):
1214
if 'ExecStart' in line:
1315
return line.split('=')[1].strip()
16+
#end define
1417

1518

1619
def get_node_args(command: str = None):
@@ -29,6 +32,17 @@ def get_node_args(command: str = None):
2932
if key:
3033
result[key] = ''
3134
return result
35+
#end define
36+
37+
38+
def restart_node():
39+
exit_code = run_as_root(["systemctl", "daemon-reload"])
40+
if exit_code:
41+
raise Exception(f"`systemctl daemon-reload` failed with exit code {exit_code}")
42+
exit_code = run_as_root(["systemctl", "restart", "validator"])
43+
if exit_code:
44+
raise Exception(f"`systemctl restart validator` failed with exit code {exit_code}")
45+
#end define
3246

3347

3448
def set_node_arg(arg_name: str, arg_value: str = ''):
@@ -49,5 +63,7 @@ def set_node_arg(arg_name: str, arg_value: str = ''):
4963
args[arg_name] = arg_value
5064
new_command = command.split(' ')[0] + ' ' + ' '.join([f'{k} {v}' for k, v in args.items()])
5165
new_service = service.replace(command, new_command)
52-
with open('/etc/systemd/system/validator.service', 'w') as f:
53-
f.write(new_service)
66+
c = f"with open('/etc/systemd/system/validator.service', 'w') as f: f.write('''{new_service}''')"
67+
run_as_root(['python3', '-c', f'"{c}"'])
68+
restart_node()
69+
#end define

0 commit comments

Comments
 (0)