Merge pull request #287 from City-of-Helsinki/update-configuration

Automatic update
City-of-Helsinki · Oct 11, 2023 · b10ffcf · b10ffcf
2 parents 748b9d6 + 927f785
commit b10ffcf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/public/sites/default/settings.php b/public/sites/default/settings.php
@@ -245,16 +245,18 @@ function drupal_get_env(string|array $variables) : mixed {
   'PROJECT_NAME',
 ]);
 
-if ($artemis_brokers = getenv('ARTEMIS_BROKERS') && $artemis_destination) {
+$artemis_brokers = getenv('ARTEMIS_BROKERS');
+
+if ($artemis_brokers && $artemis_destination) {
   $settings['stomp']['default'] = [
     'clientId' => getenv('ARTEMIS_CLIENT_ID') ?: 'artemis',
-    'login' => getenv('ARTEMIS_LOGIN'),
-    'passcode' => getenv('ARTEMIS_PASSCODE'),
+    'login' => getenv('ARTEMIS_LOGIN') ?: NULL,
+    'passcode' => getenv('ARTEMIS_PASSCODE') ?: NULL,
     'destination' => sprintf('/queue/%s', $artemis_destination),
     'brokers' => $artemis_brokers,
-    'timeout' => ['read' => 15000],
+    'timeout' => ['read' => 12000],
     'heartbeat' => [
-      'send' => 12000,
+      'send' => 20000,
       'receive' => 0,
       'observers' => [
         [