Commit Graph

47 Commits

Author SHA1 Message Date
zolliker b246d12105 bug fix after previous commit 2026-05-20 10:48:30 +02:00
zolliker 1838902c99 fix behaviour on machines with 1 single instrument
- complain when instrument name is MAIN in servicemanager.cfg
- set self.main_ins also on single instrument machines
2026-05-20 10:42:32 +02:00
HAL 1980971ec9 bugfix 2026-05-20 10:01:52 +02:00
zolliker 2f17a8ca28 allow to use one central cfg file on NFS 2026-02-17 14:27:43 +01:00
zolliker 83f04cf670 try to fix the case the *_ROOT dir is not in sys.path 2025-08-29 11:20:35 +02:00
zolliker d235f6d35f add seaman.sea_recorder
+ do_start argument logger=False disables info messages
2025-06-17 11:05:11 +02:00
zolliker 74c4e1ec92 return result in self.get_info() 2025-05-02 14:30:44 +02:00
zolliker 09d7d016e1 avoid KeyError when frappy is used with an invalid instrument 2025-05-02 11:54:00 +02:00
zolliker 0a324c3f05 treat single instance of seweb / sehistory properly
there is only one seweb / sehistory instance.
care has to be taken as the instrument is not part of the command
2025-04-30 16:13:52 +02:00
l_samenv 556a7eff9d improve missing arg handling
- better error messages
- missing instrument is only allowed with 'list'
- missing argument to be replaced with ? in error message
- sea cli may now be given with 'graph' or 'sea' for service
2025-01-21 10:52:02 +01:00
zolliker 910f281b0c add nicosenv to PATH before starting
asssure that PATH and therefore python venv ist the same when
starting frappy from NICOS and from commandline
2024-11-26 14:57:23 +01:00
zolliker 8b13e32ed7 some more cosmetic changes
- fix an intend
- add TODO: remove pkg
- add .before_bott_at to backup of seastatus.tcl
2024-06-27 15:37:59 +02:00
zolliker 95a3ff4ffd allow PY in commands, to be replaced with a specific python executable 2024-06-12 09:23:18 +02:00
l_samenv e31d0248d7 include changes from tmp branch 2024-06-10 10:19:22 +02:00
l_samenv 9fed0ead11 fix nicos help 2024-02-26 09:08:55 +01:00
zolliker a32f1c05f5 cosmetics in help 2024-02-26 09:07:22 +01:00
zolliker 343e607c1b [WIP] improve help message 2024-02-23 18:01:43 +01:00
l_samenv 0b099bab28 allow options to the commands
especially -v for frappy
2024-02-23 10:45:34 +01:00
l_samenv d8bb4999dc better error message when instance is missing 2023-12-12 10:46:55 +01:00
zolliker 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
zolliker 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
zolliker b7ab2f4656 Merge branch 'master' of gitlab.psi.ch:samenv/servicemanager 2023-09-11 08:36:27 +02:00
zolliker 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
zolliker 6130c5b5c5 improve commandline argument behaviour
+ allow hprt2 / zebra2
2023-06-05 14:38:14 +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 bca3ced5bd increase start timeout to 30 sec 2022-12-09 16:01:35 +01:00
l_samenv 0904390dc3 allow <INS> in envrionment varables in servicemanager.cfg 2022-07-06 08:45:03 +02:00
zolliker 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
zolliker 5a1bdbf9a2 put home in sys.path 2021-04-28 12:28:45 +02:00
zolliker e663c97b80 better argument treatment 2021-04-28 12:04:58 +02:00
zolliker 404288abbf keep the frappy server alive when nicos is restarted
Popen with start_new_session=True when not in run mode
2021-04-19 15:46:07 +02:00
zolliker bcb4a4ba16 determine package for remote nicos servers
+ fix a bug in ServiceManager.do_list
2021-04-14 14:16:08 +02:00
zolliker d73ec3ab9a support for connecting clients to remote servers
- define REMOTE_HOST and REMOTE_LOGIN in servicemanager.cfg
- added app argument to gui client main
2021-04-12 18:08:14 +02:00
l_samenv c7584d70b1 added config_dirs methed to FrappyManager 2021-04-09 13:57:05 +02:00
zolliker 4fb55323e3 do not show <instance> in help when not needed 2021-04-09 10:28:18 +02:00
zolliker 3748948b5d better message when server is not running
when a client is started and the server is not running,
issue 'please use ".. start .."' message
2021-04-09 10:15:32 +02:00
zolliker 9900af0e3f main ins no longer needed in command
- MAIN is automatically replaced by the basename of the home directory
- when %(ins) is omitted in *_command, it is also replaced by this
+ add help subcommand
2021-04-09 09:20:10 +02:00
l_samenv 702db45a76 improve service manager
- do not start sea server automatically
- replace _SERVICE in FRAPPY_HISTORY by service name
- imporve error messages
- no fiddling around with sys,path, reply on PYTHONPATH for
  finding packages
2021-03-15 15:11:16 +01:00
zolliker adbe97361f add logger argument to ServiceManager.restart
+ replace MAIN instrument by the name of home directory
2021-03-09 18:03:13 +01:00
zolliker 10c01a7fdd added frappy gui 2021-02-26 16:06:14 +01:00
zolliker 51abcab182 renamed to 'servicemanager'
the PYTHONPATH should be set to the directory above servicemanager
2021-02-26 14:52:24 +01:00
zolliker 632beda430 reorganize in order to make packaging better 2020-12-10 17:01:54 +01:00