determine package for remote nicos servers
+ fix a bug in ServiceManager.do_list
This commit is contained in:
4
base.py
4
base.py
@@ -148,7 +148,7 @@ class ServiceManager:
|
||||
nr = '%02d' % int(nr)
|
||||
self.commands[ins] = command
|
||||
services = self.get_services(section)
|
||||
env = {k: get_subs(section, k, ins, nr) for k in defaults if k.isupper()}
|
||||
env = {k: get_subs(section, k, ins, nr) for k in section if k.isupper()}
|
||||
result[ins] = services
|
||||
self.env[ins] = env
|
||||
self.info = result
|
||||
@@ -390,7 +390,7 @@ class ServiceManager:
|
||||
run_info.append(('', gs, port, cfg))
|
||||
if len(plist) > 1:
|
||||
rows.append(['', ' WARNING: multiple processes %s'
|
||||
% ', '.join(str(p.pid) for p, _ in plist)])
|
||||
% ', '.join(str(p.pid) for p in plist)])
|
||||
extra = sm.extra_info(ins_i)
|
||||
if extra and show_ins:
|
||||
run_info.append(['', extra])
|
||||
|
||||
Reference in New Issue
Block a user