Skip to content

Commit af35beb

Browse files
Update configuration
1 parent a446d0a commit af35beb

3 files changed

Lines changed: 31 additions & 77 deletions

File tree

compose.yaml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -161,16 +161,6 @@ services:
161161
- "traefik.port=9200"
162162
profiles:
163163
- search
164-
artemis:
165-
container_name: "${COMPOSE_PROJECT_NAME}-artemis"
166-
image: apache/activemq-artemis
167-
depends_on:
168-
- app
169-
networks:
170-
- internal
171-
- stonehenge-network
172-
profiles:
173-
- queue
174164
chromium:
175165
image: selenium/standalone-chromium
176166
environment:

composer.lock

Lines changed: 31 additions & 31 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/sites/default/settings.php

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -258,42 +258,6 @@ function drupal_get_env(string|array $variables) : mixed {
258258
$config['helfi_proxy.settings']['session_suffix'] = $session_suffix;
259259
}
260260

261-
$amq_destination = drupal_get_env([
262-
'PROJECT_NAME',
263-
]);
264-
$amq_brokers = getenv('AMQ_BROKERS');
265-
266-
if ($amq_brokers && $amq_destination) {
267-
$settings['stomp']['default'] = [
268-
'clientId' => getenv('AMQ_CLIENT_ID') ?: 'client_ ' . $amq_destination,
269-
'login' => getenv('AMQ_USER') ?: NULL,
270-
'passcode' => getenv('AMQ_PASSWORD') ?: NULL,
271-
'destination' => sprintf('/queue/%s', $amq_destination),
272-
'brokers' => $amq_brokers,
273-
'timeout' => ['read' => 12000],
274-
'heartbeat' => [
275-
'send' => 20000,
276-
'receive' => 0,
277-
'observers' => [
278-
[
279-
'class' => '\Stomp\Network\Observer\HeartbeatEmitter',
280-
],
281-
],
282-
],
283-
];
284-
285-
$queues = [
286-
'helfi_navigation_menu_queue',
287-
'helfi_api_base_revision',
288-
];
289-
foreach ($queues as $queue) {
290-
// $settings['queue_service_' . $queue] = 'queue.stomp.default';
291-
}
292-
// You must configure project specific queues manually in 'all.settings.php'
293-
// file.
294-
// @see https://github.com/City-of-Helsinki/drupal-helfi-platform/blob/main/documentation/queue.md
295-
}
296-
297261
if (
298262
($redis_host = getenv('REDIS_HOST')) &&
299263
file_exists('modules/contrib/redis/redis.services.yml') &&

0 commit comments

Comments
 (0)