linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,269 Commits 20 Branches 1 Tag
ede07e266c426624a07c2f90327377cd33b2b7a6
Commit Graph

29 Commits

Author SHA1 Message Date
Jens Krüger
9fc2aa65d5 Lib/config: Create a list of pathes only for confdir 
Under some condition (no general config file) it's possible that the
piddir and logdir as well are lists of pathes which creates some errors
during the server start

This problems occurs at least in NICOS test suite where no general
config file is defined.

Change-Id: I94c5db927923834c1546dbc34e2490b07b0bf111
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34952
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Jens Krueger <jens.krueger@tum.de>
 2024-11-19 14:01:20 +01:00
Markus Zolliker
81f7426739 frappy.lib.multievent: avoid deadlock 
use RLock instead of Lock, as queued actions might call
the set/clear methods recursively

Change-Id: Id43aa8669955e6be9f61379d039a4f65eb7b2dc4
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34950
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-11-15 10:39:47 +01:00
Markus Zolliker
8e05090795 generalConfig: fix the case when confdir is a list of paths 
convert all env variable values containing ':' into a list of paths
+ fix one case where an env variable is not converted to a Path
+ remove unused _gcfg_help

Change-Id: Ibc51ab4606ca51e0e87d0fedfac1aca4952f3270
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34872
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-11-15 10:39:47 +01:00
Alexander Zaft
e333763105 generalconfig: streamlined config discovery 
determine generalconfig file location in order:
  - command line argument
  - environment variable
  - git location (../cfg)
  - local location (cwd)
  - global location (/etc/frappy)

Change-Id: Ie34bcbd5188837075ee7bb7d5029d676ae72378e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34839
Reviewed-by: Bjoern Pedersen <bjoern.pedersen@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-11-15 10:39:47 +01:00
dmc
f382a01d86 fix case where confdir is a list of paths 2024-10-24 11:46:23 +02:00
Georg Brandl
824d3e7b7a lib: there might be no confdir in "cfg" 
Change-Id: I0832de4564a2c1ff439c486ae6cbaa776ebf1e59
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34833
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2024-10-23 09:26:48 +02:00
Markus Zolliker
f9f713811e do not fail when generalConfig.init() is called twice 
Change-Id: I7132b71f906fc8a77b6fedcdcc2c7d4a3e48830a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34818
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2024-10-17 08:08:16 +02:00
Alexander Zaft
13db0d6bc6 generalConfig, config: use pathlib 
- switch to pathlib
- represent multiple confdirs as list of Paths internally, not string
  with pathsep

Change-Id: I1418e561641e27cd904af0762be056cd66ee1919
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34464
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-10-17 08:07:11 +02:00
Georg Brandl
5083db8d92 remove walrus 
So far, frappy is still supposed to be 3.6 compatible

Change-Id: Ieb56c6500d58cdc1fe2f34b1448b05ba74b0fa6e
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34326
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Georg Brandl <g.brandl@fz-juelich.de>
 2024-09-13 09:02:04 +02:00
Alexander Zaft
bd84a69537 lib: GeneralConfig fix missing keys logic 
Change-Id: I814511fff6fbf7c94e30a052bff0712fad9805b5
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34306
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
 2024-09-13 09:02:04 +02:00
Alexander Zaft
f0f12d6d96 lib: Fix GeneralConfig defaults handling 
overwriting defaults before init() had no effect, as the values were
replaced there.
Now, only unset defaults are updated, keeping the overrides.
Also fix unconditionally taking the values from environment variables.

Change-Id: Idf1c5e2338403e061d20c11ed9c4803d535eb188
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/34304
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-09-13 09:02:04 +02:00
Jens Krüger
318b3ad412 Update copyright year 
Change-Id: I7fe65e46639c2d8948fa93303ee9b14393e8bfca
 2024-09-13 08:59:40 +02:00
Alexander Zaft
6837b82791 add option for delayed imports 
will make setup checking easier, although it does not work for all cases
(from imports for example)

Change-Id: I2e5cf9b427a6f8e6f603d9662cdb9700d5f9ad9a
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33893
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2024-06-17 15:20:21 +02:00
Markus Zolliker
4c6bc2ba68 frappy.lib.asynconn: handle ConnectionResetError nicely 
Change-Id: Icba24ffb82369aa78e431d12260f4f3cc795e511
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33902
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
 2024-06-12 11:25:22 +02:00
l_samenv
67fa50a9e0 [WIP] fixes for gas10ka / varioxB 
treat proxy for io correctly
 2024-06-10 10:11:03 +02:00
Markus Zolliker
0f50de9a7f fix command doc string handling and change default stop doc string 
- fix inheritance of command description
- when no stop method is given, then the description should indicate
  that stop is a no-op -> add missing doc strings to stop methods
- add test to make sure stop command doc strings are given
  when implemented

Change-Id: If891359350e8dcdec39a706841d61d4f8ec8926f
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/33266
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-03-08 15:34:08 +01:00
Markus Zolliker
2126956160 adopt missing changes while cherry-picking from mlz 
Change-Id: Icda4d581e8f0ebd22fc22f2661965bf98a821a34
 2024-01-29 14:29:23 +01:00
Alexander Zaft
15d38d7cc1 all: remove coding cookies 
Change-Id: I53a4d79c3ebc50b8aed43a5ef1fa6538f8059a47
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32251
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Alexander Zaft <a.zaft@fz-juelich.de>
 2024-01-29 14:06:06 +01:00
Markus Zolliker
158477792f add StringIO.writeline, improve StringIO.multicomm 
- StringIO.writeline sends a command and does not expect a reply
- StringIO.multicomm and BytesIO.multicomm is improved in order
  to insert individual delays in between lines and individual
  noreply flags

+ fix a bug in tutorial_t_control
+ improve readability of frappy.lib.classdoc.indent_description

Change-Id: I9dea113e19147684ec41aca5267a79816bbf202c
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/32267
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2024-01-29 13:34:45 +01:00
Markus Zolliker
db9ce02028 Revert "revert commits done before MZ holidays" 
This reverts commit d2885bdd72.
 2023-08-18 16:32:16 +02:00
Markus Zolliker
2020928289 improve error message on client when host/port is bad 
for host name without port, None was used for the port
leading to a confusing error message

- do not call parse_host_port with None as defaultport argument
- improve error message when connection fails

+ fix an error in last line of parse_ipv6_host_and_port
+ fix some issues breaking PEP 8 rules

Change-Id: I437360be96449c164f0080e3c60f1685825d4780
Reviewed-on: https://forge.frm2.tum.de/review/c/secop/frappy/+/31911
Tested-by: Jenkins Automated Tests <pedersen+jenkins@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
Reviewed-by: Markus Zolliker <markus.zolliker@psi.ch>
 2023-08-07 16:15:30 +02:00
Markus Zolliker
d2885bdd72 revert commits done before MZ holidays 
they are all not neccessary for SINQ SE operation

Change-Id: Ic9adcccf685752ab90bb6b86005ac8e04b302855
 2023-07-06 08:03:15 +02:00
Markus Zolliker
975593dd6b update to gerrit version 
Change-Id: Ifdaa28dd961a529cd9197c4c3639744f108b0a6a
 2023-07-05 17:33:05 +02:00
zebra
ee31f8fb45 fix merge_status in HasConvergence 2023-06-05 13:03:38 +02:00
Markus Zolliker
c5d429346d update 2023-05-30 from gitmlz 
Change-Id: I0b1eb2941692fde5c9d98f107fc38315625dcfdb
 2023-05-31 14:16:12 +02:00
Markus Zolliker
bef190b77d software ramp mixin 
+ fix frappy.lib.merge_status

Change-Id: I550eaeaab460a0d9ac1b027d59d4223dac4c0663
 2023-05-25 17:53:36 +02:00
Markus Zolliker
8039351395 mercury, ips, sea, triton, convergence 
after gerrit

Change-Id: Iff14047ecc476589aef10c96fae9970133b8bd14
 2023-05-09 14:57:34 +02:00
Markus Zolliker
3fcd72b189 merge manually with mlz repo 
as of 2023-05-04

Change-Id: I5926617c454844927799e20a489db20d538db100
 2023-05-04 16:34:09 +02:00
Markus Zolliker
da15df076a fetched mlz version 
- before some chamges in the gerrit pipline

Change-Id: I33eb2d75f83345a7039d0fb709e66defefb1c3e0
 2023-05-02 15:25:11 +02:00