beremiz

python runtime: use given service name (-n CLI option) as CRA ID by default.
py2compat
15 months ago, Edouard Tisserant
5bc50ff989be
Parents 7bcc4186e3a7
Children c1b4f72b2f01
python runtime: use given service name (-n CLI option) as CRA ID by default.
2 files changed, 7 insertions(+), 3 deletions(-)
  • +1 -1
    Beremiz_service.py
  • +6 -2
    runtime/WampClient.py
    • --- a/Beremiz_service.py Wed Feb 26 16:30:09 2025 +0100
    +++ b/Beremiz_service.py Wed Feb 26 16:31:59 2025 +0100
    @@ -575,7 +575,7 @@
    if havewamp:
    try:
    - WC.RegisterWampClient(wampconf, PSKpath, ConfDir, KeyStore)
    + WC.RegisterWampClient(wampconf, PSKpath, ConfDir, KeyStore, servicename)
    WC.RegisterWebSettings(NS)
    except Exception:
    LogMessageAndException(_("WAMP client startup failed. "))
    --- a/runtime/WampClient.py Wed Feb 26 16:30:09 2025 +0100
    +++ b/runtime/WampClient.py Wed Feb 26 16:31:59 2025 +0100
    @@ -279,8 +279,12 @@
    return re.match(r'wss?://[^\s?:#-]+(:[0-9]+)?(/[^\s]*)?$', uri) is not None
    -def RegisterWampClient(wampconf=None, wampsecret=None, ConfDir=None, KeyStore=None):
    - global _WampConf, _WampSecret, _WampTrust
    +def RegisterWampClient(wampconf=None, wampsecret=None, ConfDir=None, KeyStore=None, servicename=None):
    + global _WampConf, _WampSecret, _WampTrust, defaultWampConfig
    +
    + if servicename:
    + defaultWampConfig["ID"] = servicename
    +
    ConfDir = ConfDir if ConfDir else WorkingDir
    KeyStore = KeyStore if KeyStore else WorkingDir