frappy() indicates also if frappy server is not running
+ improvements in the envlist creation
This commit is contained in:
@@ -26,6 +26,7 @@ from glob import glob
|
||||
from configparser import ConfigParser
|
||||
|
||||
from nicos import session, config
|
||||
from nicos.core import status
|
||||
from nicos.utils import printTable
|
||||
from nicos.commands import helparglist, usercommand
|
||||
from nicos.commands.basic import AddSetup, CreateAllDevices, CreateDevice
|
||||
@@ -98,17 +99,16 @@ def frappy_start(**services):
|
||||
cfginfo = services.get(service)
|
||||
if cfginfo is None:
|
||||
if not secnode:
|
||||
continue
|
||||
continue
|
||||
cfginfo = secnode() or ''
|
||||
all_cfg[service] = cfginfo
|
||||
else:
|
||||
if cfginfo:
|
||||
new_cfg.append((service, secnode, cfginfo))
|
||||
else:
|
||||
remove_cfg.append(secnode)
|
||||
all_cfg[service] = cfginfo
|
||||
if secnode:
|
||||
secnode('')
|
||||
all_cfg[service] = secnode.get_info()
|
||||
|
||||
# check cfg is not used twice
|
||||
for cfg in cfginfo.split(','):
|
||||
@@ -126,6 +126,7 @@ def frappy_start(**services):
|
||||
AddSetup('frappy_' + service)
|
||||
secnode = session.devices[nodename]
|
||||
secnode(cfginfo)
|
||||
all_cfg[service] = secnode.get_info()
|
||||
CreateDevice(nodename)
|
||||
cleanup_defunct()
|
||||
CreateAllDevices()
|
||||
|
||||
Reference in New Issue
Block a user