XMR: fix relayMessages setting.

xibosignage · Jan 13, 2025 · e48d4c8 · e48d4c8
1 parent 6ed3ecc
commit e48d4c8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -33,7 +33,7 @@ echo '  "queueSize": '$XMR_QUEUE_SIZE',' >> /opt/xmr/config.json
 echo '  "debug": '$XMR_DEBUG',' >> /opt/xmr/config.json
 echo '  "ipv6PubSupport": '$XMR_IPV6PUBSUPPORT',' >> /opt/xmr/config.json
 echo '  "relayOldMessages": "'$XMR_RELAY_OLD_MESSAGES'",' >> /opt/xmr/config.json
-echo '  "relayMessages": '$XMR_RELAY_MESSAGES >> /opt/xmr/config.json
+echo '  "relayMessages": "'$XMR_RELAY_MESSAGES'"' >> /opt/xmr/config.json
 echo '}' >> /opt/xmr/config.json
 
 /usr/local/bin/php /opt/xmr/index.php
diff --git a/src/Controller/Relay.php b/src/Controller/Relay.php
@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright (C) 2024 Xibo Signage Ltd
+ * Copyright (C) 2025 Xibo Signage Ltd
  *
  * Xibo - Digital Signage - https://xibosignage.com
  *
@@ -39,7 +39,7 @@ public function __construct(
         private string $relayOldMessages,
     ) {
         // Create a client for us to use
-        if (!empty($this->relayMessages)) {
+        if (!empty($this->relayMessages) && $this->relayMessages !== 'false') {
             $this->client = new Client([
                 'base_uri' => $this->relayMessages,
             ]);
@@ -66,12 +66,12 @@ public function configureZmq(): void
 
     public function isRelay(): bool
     {
-        return !empty($this->relayMessages);
+        return !empty($this->relayMessages) && $this->relayMessages !== 'false';
     }
 
     public function isRelayOld(): bool
     {
-        return !empty($this->relayOldMessages);
+        return !empty($this->relayOldMessages) && $this->relayOldMessages !== 'false';
     }
 
     /**