From ce57d3ee7c9d0ca2d59bb71907f46bbda49470e5 Mon Sep 17 00:00:00 2001
From: Moritz Kiemer <moritz.kiemer@checkmk.com>
Date: Fri, 7 Feb 2025 10:51:55 +0100
Subject: [PATCH] immediately return from RMQ starting

This improves UX, with the slight risk
of having it fail immediately without
noticing right away.

CMK-21190

Change-Id: Iba891076fb7a2ad2493cbd9ef35d57889e731fd5
---
 .../rabbitmq/skel/etc/init.d/rabbitmq         | 23 +++----------------
 1 file changed, 3 insertions(+), 20 deletions(-)

diff --git a/omd/packages/rabbitmq/skel/etc/init.d/rabbitmq b/omd/packages/rabbitmq/skel/etc/init.d/rabbitmq
index bcaf63eb20b..cd93de2afc4 100755
--- a/omd/packages/rabbitmq/skel/etc/init.d/rabbitmq
+++ b/omd/packages/rabbitmq/skel/etc/init.d/rabbitmq
@@ -43,32 +43,15 @@ await_process_stop() {
     return 1
 }
 
-rabbitmq_accepting_connections() {
-    "${RABBITMQ_DIAGNOSTICS}" check_port_listener --node "${RABBITMQ_NODENAME}" "${RABBITMQ_PORT}"
-    # no idea why we can't use this anymore; it will fail for the management plugin
-    # "${RABBITMQ_DIAGNOSTICS}" check_port_connectivity --node "${RABBITMQ_NODENAME}"
-}
-
 await_process_start() {
-    # Only write output in the end, otherwise we clobber the logfile.
     max=$(("${1}" * 10))
     # If the PIDFILE gets filled, rabbitmq started
     for N in $(seq "${max}"); do
-        [ -s "${PIDFILE}" ] && rabbitmq_accepting_connections &>/dev/null && break
-        [ -e "${PIDFILE}" ] || {
-            date +"%F %T.%N RabbitMQ failed to start (pidfile vanished)"
-            return 1
-        }
+        [ $((N % 10)) -eq 0 ] && printf "."
+        [ -s "${PIDFILE}" ] && return 0
+        [ -e "${PIDFILE}" ] || return 1
         sleep 0.1
     done
-
-    # once again, mostly to get the output of the diagnostics call
-    [ -s "${PIDFILE}" ] && rabbitmq_accepting_connections && {
-        date +"%F %T.%N RabbitMQ considered ready"
-        return 0
-    }
-
-    date +"%F %T.%N RabbitMQ failed to start (giving up after timeout)"
     return 1
 }