From 79935add663e1cc457fc4e1c4911a81a60e44881 Mon Sep 17 00:00:00 2001 From: Jeremy Cline Date: Wed, 17 Apr 2024 11:10:46 -0400 Subject: [PATCH] cloud-image-uploader: Fix routing key for AMQP binding env renders to "production" which is not what messages are published under ("prod"). Match what other apps are doing and just use a wildcard so it'll match anything. Since prod and stage are separate brokers this is fine. --- playbooks/openshift-apps/cloud-image-uploader.yml | 2 +- .../openshift-apps/cloud-image-uploader/templates/config.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/openshift-apps/cloud-image-uploader.yml b/playbooks/openshift-apps/cloud-image-uploader.yml index e2c1952503..93313ab735 100644 --- a/playbooks/openshift-apps/cloud-image-uploader.yml +++ b/playbooks/openshift-apps/cloud-image-uploader.yml @@ -13,7 +13,7 @@ username: "cloud-image-uploader{{ env_suffix }}" queue_name: "cloud-image-uploader{{ env_suffix }}" routing_keys: - - "org.fedoraproject.{{ env }}.buildsys.build.state.change" + - "org.fedoraproject.*.buildsys.build.state.change" thresholds: warning: 10 critical: 50 diff --git a/roles/openshift-apps/cloud-image-uploader/templates/config.toml b/roles/openshift-apps/cloud-image-uploader/templates/config.toml index 10b87d9cba..05acf898a2 100644 --- a/roles/openshift-apps/cloud-image-uploader/templates/config.toml +++ b/roles/openshift-apps/cloud-image-uploader/templates/config.toml @@ -19,7 +19,7 @@ app_contacts_email = "cloud@lists.fedoraproject.org" [[bindings]] queue = "cloud-image-uploader{{ env_suffix }}" exchange = "amq.topic" -routing_keys = ["org.fedoraproject.{{ env }}.buildsys.build.state.change"] +routing_keys = ["org.fedoraproject.*.buildsys.build.state.change"] [queues."cloud-image-uploader{{ env_suffix }}"] durable = true @@ -83,7 +83,7 @@ stream = "ext://sys.stdout" level = "INFO" propagate = false handlers = ["console"] - + [log_config.loggers.fedora_cloud_image_uploader] level = "INFO" propagate = false