Mercurial Mercurial > beremiz / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | bz2 | zip | gz | help
python runtime: use given service name (-n CLI option) as CRA ID by default.
authorEdouard Tisserant <edouard@beremiz.fr>
Wed, 26 Feb 2025 16:31:59 +0100 (4 weeks ago)
changeset 4117 49e297aaf694
parent 4116 78e331383533
child 4118 f9f116d8a022
python runtime: use given service name (-n CLI option) as CRA ID by default.
Beremiz_service.py file | annotate | diff | comparison | revisions
runtime/WampClient.py file | annotate | diff | comparison | revisions 
--- a/Beremiz_service.py	Wed Feb 26 16:30:09 2025 +0100
+++ b/Beremiz_service.py	Wed Feb 26 16:31:59 2025 +0100
@@ -551,7 +551,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
@@ -275,8 +275,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
beremiz