77 Commits

Author SHA1 Message Date
9839d4df0c Merge branch 'master' of gitlab.psi.ch:samenv/servicemanager 2023-10-26 10:16:26 +02:00
df00960244 try-catch around renaming old SeaServer 2023-10-26 10:15:03 +02:00
a7bdd91663 bug fix (sea cfg ext must be .addon not .addons) 2023-10-24 13:07:44 +02:00
aeebccdf89 catch missing previous SeaServer on reload 2023-10-24 13:07:16 +02:00
2d3394e205 rework guess_cfg to get_server_state 2023-10-17 15:16:08 +02:00
fc364f0fc6 improve frappy manager
- add functionality to guess combination of configurations from
  the running sea and frappy servers
- instead of the name only, the references to the config in
  the SeaClient modules are used
- make this information also visibible in frappy list
2023-09-20 17:01:06 +02:00
dmc
957a5f0b2c fix bug when restarting all frappy services
- return a copy of the modified env dict instread of modifiying in place
2023-09-14 14:09:08 +02:00
5b7a151222 frappyman: fix missing addonsticks set 2023-09-14 09:14:32 +02:00
ac2ff53cb3 better handling of keyboard interrupt on 'run'
+ add ServiceManager.get_cfg (works then also for FrappyManager)
2023-09-14 09:12:24 +02:00
09a6d1cbbe remove unneeded code 2023-09-13 17:42:44 +02:00
b651ad205f respect sea cfg and confirmed plugged device 2023-09-13 17:20:07 +02:00
c5a7f4a494 [WIP] '?' for sea devices without frappy cfg 2023-09-12 11:37:39 +02:00
840bd59bb1 [WIP] sea info: return '?' for when confirmed device does not match 2023-09-12 09:05:44 +02:00
79ce2947a6 [WIP] include SEA info (2) 2023-09-11 08:47:02 +02:00
b7ab2f4656 Merge branch 'master' of gitlab.psi.ch:samenv/servicemanager 2023-09-11 08:36:27 +02:00
008690fe84 [WIP] include SEA info 2023-09-11 08:35:38 +02:00
l_samenv
b4d41a297d do not accept stop without instrument or 'all' 2023-08-25 21:07:49 +02:00
l_samenv
1c0ff3a121 do not crash when process is already killed in the mean time 2023-08-25 16:58:53 +02:00
l_samenv
a255b9b715 unify do_listcfg and nicos frappy_list() 2023-06-06 16:20:37 +02:00
6130c5b5c5 improve commandline argument behaviour
+ allow hprt2 / zebra2
2023-06-05 14:38:14 +02:00
l_samenv
fcef9cb142 remove debug print 2023-05-16 14:01:32 +02:00
l_samenv
e5f7aded92 starting multiple nodes with frappy cli 2023-05-16 14:00:11 +02:00
l_samenv
02ca6de3ec make new version of frappy work
- frappy instead of secop
- python cfg files
2023-05-04 14:57:01 +02:00
l_samenv
42125b9887 fix restart without cfg
restart did not work when no cfg was given and process was
in zombie state

+ fix restart 'all'
2022-12-22 16:36:47 +01:00
l_samenv
91cf31dde5 rework sea cfg
use seaststus.tcl instead of a live connection for getting
the current SEA cfg. cfg is now shown also when all instruments
are listed
2022-12-21 13:37:17 +01:00
l_samenv
b387177668 add frappy cli 2022-12-09 16:01:49 +01:00
l_samenv
bca3ced5bd increase start timeout to 30 sec 2022-12-09 16:01:35 +01:00
l_samenv
6c04fac37f reload SeaServer executable when needed 2022-09-23 08:43:01 +02:00
b81c98448d bug fix: FRAPPY_CONFDIR not mandatory 2022-09-20 14:29:05 +02:00
l_samenv
a7559c648e missing expanduser in FrappyManager.config_dirs
+ start nicos with python3
2022-08-23 16:18:38 +02:00
l_samenv
e67fa0bc35 make 'frappy listcfg' bhave like nicos 'frappy_list()' 2022-07-06 08:45:26 +02:00
l_samenv
0904390dc3 allow <INS> in envrionment varables in servicemanager.cfg 2022-07-06 08:45:03 +02:00
a3453e6b0e frappyman: inherit PYTHONPATH from starting process
on SINQ instruments, when frappy is started from nicos,
nicos.conf contains PYTHONPATH  = /home/<instr>:/home/<instr>/.local...
this should be applied to the frappy process too
2022-06-20 15:03:39 +02:00
34e13ccc67 frappyman: raise from None 2022-06-08 16:40:17 +02:00
ac9e35123c better error message when cfg file does not exist 2022-06-08 16:34:28 +02:00
l_samenv
5640c4ea08 Merge branch 'master' of gitlab.psi.ch:samenv/servicemanager 2022-04-26 09:54:32 +02:00
4b38869edb Merge branch 'master' of gitlab.psi.ch-samenv:samenv/servicemanager
Conflicts:
	frappyman.py
2022-04-26 09:53:56 +02:00
1f5bdcde8d fix errors in frappyman
+ missing section key FRAPPY
+ use expanduser
2022-04-26 09:49:45 +02:00
l_samenv
b436eee810 no wildcards in sea client 2022-04-26 09:24:11 +02:00
7ea4de02b4 add requirements.txt 2022-04-20 16:11:27 +02:00
4e58fb463f fix issues with auto detection args
+ treat develop cfg correctly
2022-04-20 16:09:37 +02:00
247e660717 fix issues with config dirs 2022-04-20 16:08:05 +02:00
192bdca648 use general config file instead of SECOP_CONF
for getting the config directories
2022-04-13 11:48:17 +02:00
f411460c2c introduce wildcards for <instance> 2021-12-06 14:39:04 +01:00
l_samenv
bb3c72acc9 better args checking, sea list: cfg shown only on single items 2021-12-06 11:54:19 +01:00
l_samenv
e7c1fce854 Merge branch 'master' of gitlab.psi.ch:samenv/servicemanager 2021-05-07 16:35:14 +02:00
l_samenv
0be8ae7fe1 support to start sea automatically from SeaClient (with -q arg) 2021-05-07 16:34:10 +02:00
1e384d7deb added gitignore 2021-04-28 17:13:48 +02:00
5a1bdbf9a2 put home in sys.path 2021-04-28 12:28:45 +02:00
6a34bd164b fix bug in SeaManager with foreign instrument 2021-04-28 12:11:57 +02:00