linse/servicemanager
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix setups and 'nicos create' with linse_nicos repo

Browse Source
This commit is contained in:
zolliker
2025-11-19 14:58:08 +01:00
parent 83f04cf670
commit f73f764094
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
__init__.py
View File

@@ -54,7 +54,7 @@ def run(group, arglist):
arg_is = { arg_is = {
'action': lambda arg: hasattr(serv, 'do_' + arg), 'action': lambda arg: hasattr(serv, 'do_' + arg),
'ins': lambda arg: arg in serv.info or arg == 'all' or serv.wildcard(arg), 'ins': lambda arg: arg in serv.info or arg in ('all', 'check') or serv.wildcard(arg),
'service': lambda arg: arg in serv.services, 'service': lambda arg: arg in serv.services,
} }

8
nicosman.py
View File

@@ -96,13 +96,13 @@ class NicosManager(ServiceManager):
self.get_info() self.get_info()
for ins_i in ins_list: for ins_i in ins_list:
env = self.env[ins_i] env = self.env[ins_i]
base = join(env['NICOS_ROOT'], env['NICOS_PACKAGE'], ins) base = join(env['NICOS_ROOT'], env['NICOS_PACKAGE'], ins_i)
nicos_conf = join(base, 'nicos.conf') nicos_conf = join(base, 'nicos.conf')
content = { content = {
'nicos': { 'nicos': {
'setup_subdirs': '["%s", "common", "frappy_sinq"]' % ins, 'setup_subdirs': '["%s", "linse_nicos", "frappy_sinq"]' % ins_i,
'logging_path': '"%s/%s"' % (env['NICOS_LOG'], ins), 'logging_path': '"%s/%s"' % (env['NICOS_LOG'], ins_i),
'pid_path': '"%s/%s"' % (env['NICOS_LOG'], ins), 'pid_path': '"%s/%s"' % (env['NICOS_LOG'], ins_i),
}, },
# 'environment': { # 'environment': {
# key: f'"{env[key]}"' for key in env if key in ENV_KEYS # key: f'"{env[key]}"' for key in env if key in ENV_KEYS