Merge pull request #805 from MetPX/issue802-post-broker-user

for #802 adds POST_BROKER_USER
MetPX · Nov 3, 2023 · c33898b · c33898b
2 parents 640e285 + db90eed
commit c33898b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/docs/source/Reference/sr3_options.7.rst b/docs/source/Reference/sr3_options.7.rst
@@ -130,6 +130,7 @@ option, with the use of *${..}* notation:
 * PBD      - the post base dir
 * *var*    - any environment variable.
 * BROKER_USER - the user name for authenticating to the broker (e.g. anonymous)
+* POST_BROKER_USER - the user name for authenticating to the post_broker (e.g. anonymous)
 * PROGRAM     - the name of the component (subscribe, shovel, etc...)
 * CONFIG      - the name of the configuration file being run.
 * HOSTNAME    - the hostname running the client.

diff --git a/docs/source/fr/Reference/sr3_options.7.rst b/docs/source/fr/Reference/sr3_options.7.rst
@@ -134,6 +134,7 @@ en utilisant la notation *${..} * :
 * PBD      - le "post base dir".
 * *var*    - n'importe quelle variable d’environnement.
 * BROKER_USER - le nom d’utilisateur pour l’authentification auprès du courtier (par exemple, anonyme)
+* POST_BROKER_USER - le nom d’utilisateur pour l’authentification auprès du courtier de destination (post_broker)
 * PROGRAM     - le nom du composant (subscribe, shovel, etc...)
 * CONFIG      - le nom du fichier de configuration en cours d'exécution.
 * HOSTNAME    - le hostname qui exécute le client.

diff --git a/sarracenia/config.py b/sarracenia/config.py
@@ -909,6 +909,10 @@ def _varsub(self, word):
             result = result.replace('${BROKER_USER}', self.broker.url.username)
             # FIXME: would this work also automagically if BROKER.USERNAME ?
 
+        if (('${POST_BROKER_USER}' in word) and hasattr(self, 'post_broker') and self.post_broker is not None and
+                self.post_broker.url is not None and hasattr(self.post_broker.url, 'username')):
+            result = result.replace('${POST_BROKER_USER}', self.post_broker.url.username)
+
         if not '$' in result:
             return result