Skip to content

Commit

Permalink
Merge pull request #626 from City-of-Helsinki/dev
Browse files Browse the repository at this point in the history
Dev to main
  • Loading branch information
khalima authored Dec 5, 2024
2 parents eedefe5 + c98069d commit a828b86
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ services:
profiles:
- search
elastic:
image: docker.elastic.co/elasticsearch/elasticsearch:8.4.0
image: docker.elastic.co/elasticsearch/elasticsearch:8.16.1
container_name: "${COMPOSE_PROJECT_NAME}-elastic"
environment:
- node.name="${COMPOSE_PROJECT_NAME}-elastic"
Expand Down
14 changes: 7 additions & 7 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 15 additions & 15 deletions docker/openshift/crons/menu-queue.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
#!/bin/sh

source /init.sh

if [ -z "$AMQ_BROKERS" ]; then
exit 0
fi

if ! is_drupal_module_enabled "helfi_navigation"; then
exit 0
fi

while true
do
# Restart process every 12 hours.
drush stomp:worker helfi_navigation_menu_queue --lease-time 43200
done
#source /init.sh
#
#if [ -z "$AMQ_BROKERS" ]; then
# exit 0
#fi
#
#if ! is_drupal_module_enabled "helfi_navigation"; then
# exit 0
#fi
#
#while true
#do
# # Restart process every 12 hours.
# drush stomp:worker helfi_navigation_menu_queue --lease-time 43200
#done
18 changes: 9 additions & 9 deletions docker/openshift/crons/revision-queue.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/sh

if [ -z "$AMQ_BROKERS" ]; then
exit 0
fi

while true
do
# Restart process every 12 hours.
drush stomp:worker helfi_api_base_revision --lease-time 43200
done
#if [ -z "$AMQ_BROKERS" ]; then
# exit 0
#fi
#
#while true
#do
# # Restart process every 12 hours.
# drush stomp:worker helfi_api_base_revision --lease-time 43200
#done

0 comments on commit a828b86

Please sign in to comment.