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

Automatic update
City-of-Helsinki · Oct 5, 2023 · 2078599 · 2078599
2 parents 96a8905 + 742b058
commit 2078599
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 59 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml
@@ -8,8 +8,8 @@ id: helfi_announcements
 label: 'Helfi: Announcements'
 label_plural: 'Helfi: Announcements'
 description: ''
-generate_aliases: null
 read_only: true
+generate_aliases: null
 field_mapper_id: jsonpath
 field_mapper_config:
   field_mappings:

diff --git a/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml b/conf/cmi/simple_sitemap.bundle_settings.default.menu_link_content.main.yml
diff --git a/conf/cmi/simple_sitemap.settings.yml b/conf/cmi/simple_sitemap.settings.yml
@@ -15,4 +15,3 @@ disable_language_hreflang: false
 excluded_languages: {  }
 enabled_entity_types:
   - node
-  - menu_link_content
diff --git a/docker/openshift/crons/purge-queue.sh b/docker/openshift/crons/purge-queue.sh
@@ -12,8 +12,15 @@ function has_items {
 while true
 do
   if has_items; then
-    drush p:queue-work --no-interaction --finish --format=json | jq --arg DATE "$(date +'%Y-%m-%dT%H:%M:%S%:z')" -c '.[] |= . + {"date" : $DATE}'
+    RESULT=$(drush p:queue-work --no-interaction --finish --format=json | jq --arg DATE "$(date +'%Y-%m-%dT%H:%M:%S%:z')" -c '.[] |= . + {"date" : $DATE}')
+    # RESULT is an array of json objects. Process each result and
+    # only output the failed items.
+    echo $RESULT | jq -c '.[]' | while read LINE; do
+      if [ $(echo "$LINE" | jq .failed) -gt "0" ]; then
+        echo $LINE
+      fi
+    done
   fi
-  # Sleep for 60 seconds.
+
   sleep 60
 done