From 253ffde88bda2684e1e773bb41555e8311739196 Mon Sep 17 00:00:00 2001 From: "Patrick M. Niedzielski" Date: Thu, 12 Dec 2024 18:35:10 -0500 Subject: [PATCH] =?UTF-8?q?Use=20term=20=E2=80=9Capplication=20subscriptio?= =?UTF-8?q?ns=E2=80=9D=20in=20log?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This patch completes the work of replacing the older term “auto subscription” with the newer term “application subscription” by changing log lines that the broker outputs. This may break some external applications, so it is included as its own patch. Signed-off-by: Patrick M. Niedzielski --- src/groups/mqb/mqbblp/mqbblp_rootqueueengine.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/groups/mqb/mqbblp/mqbblp_rootqueueengine.cpp b/src/groups/mqb/mqbblp/mqbblp_rootqueueengine.cpp index ab164fb56..bb4ed3a37 100644 --- a/src/groups/mqb/mqbblp/mqbblp_rootqueueengine.cpp +++ b/src/groups/mqb/mqbblp/mqbblp_rootqueueengine.cpp @@ -341,7 +341,7 @@ int RootQueueEngine::configure(bsl::ostream& errorDescription, BALL_LOG_ERROR << "#QUEUE_CONFIGURE_FAILURE Queue '" << d_queueState_p->queue()->description() - << "' failed to compile auto subscription: '" + << "' failed to compile application subscription: '" << subscriptions[i].expression().text() << "' for the '" << itApp->first << "' app, rc: " << rc << ", reason: '" @@ -352,7 +352,7 @@ int RootQueueEngine::configure(bsl::ostream& errorDescription, else { BALL_LOG_WARN << "Queue \"" << d_queueState_p->queue()->description() - << "' ignores auto subscription: '" + << "' ignores application subscription: '" << subscriptions[i].appId() << "'"; } } @@ -370,7 +370,8 @@ int RootQueueEngine::configure(bsl::ostream& errorDescription, if (subscriptions.size() > 1) { BALL_LOG_ERROR << "#QUEUE_CONFIGURE_FAILURE Queue '" << d_queueState_p->queue()->description() - << "' Cannot have more than 1 auto subscription"; + << "' Cannot have more than 1 application " + << "subscription"; return rc_APP_SUBSCRIPTIONS_ERROR; // RETURN } @@ -393,7 +394,7 @@ int RootQueueEngine::configure(bsl::ostream& errorDescription, BALL_LOG_ERROR << "#QUEUE_CONFIGURE_FAILURE Queue '" << d_queueState_p->queue()->description() - << "' Failed to compile auto subscription: '" + << "' Failed to compile application subscription: '" << subscriptions[0].expression().text() << "', rc: " << rc << ", reason: '" << bmqeval::ErrorType::toString(errorType) << "'";