From a1fbd9680a66c6ea5c19566b188bd74366424d17 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Tue, 1 Apr 2014 18:38:15 +0100
Subject: Fix race in systemd service startup (RHBZ#1059913).

---
 rabbitmq-server.service | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'rabbitmq-server.service')

diff --git a/rabbitmq-server.service b/rabbitmq-server.service
index e56171b..193661d 100644
--- a/rabbitmq-server.service
+++ b/rabbitmq-server.service
@@ -8,6 +8,9 @@ User=rabbitmq
 Group=rabbitmq
 Environment=RABBITMQ_PID_FILE=/var/run/rabbitmq/pid
 WorkingDirectory=/var/lib/rabbitmq
+# Ensure cookie is created to avoid race
+# See https://bugzilla.redhat.com/show_bug.cgi?id=1059913
+ExecStartPre=-/bin/sh -c "/usr/lib/rabbitmq/bin/rabbitmqctl status > /dev/null 2>&1"
 ExecStart=/usr/lib/rabbitmq/bin/rabbitmq-server
 ExecStartPost=/usr/lib/rabbitmq/bin/rabbitmqctl wait /var/run/rabbitmq/pid
 ExecStop=/usr/lib/rabbitmq/bin/rabbitmqctl stop
-- 
cgit