From ad7e8c63e6891c59eb4387a01d94838f60370930 Mon Sep 17 00:00:00 2001
From: Sean Dague <sean.dague@samsung.com>
Date: Wed, 19 Mar 2014 19:13:20 -0400
Subject: [PATCH] move the rsyslogd restart

it's not clear why swift start is the place where an rsyslogd start
is happening, we should really only make this change when we actually
change a file on disk.

Also, use rsyslogd's -HUP signal directly instead of the system init
scripts which are typically doing a stop and start, and apparently
racing under some circumstances.

Change-Id: I1b9891313d67b1da2ca2582e532b2536a81f9b25
Closes-Bug: #1262906
---
 lib/swift | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/swift b/lib/swift
index b65544046a..f20df95e08 100644
--- a/lib/swift
+++ b/lib/swift
@@ -454,6 +454,9 @@ EOF
     sudo chown -R ${STACK_USER}:adm ${swift_log_dir}
     sed "s,%SWIFT_LOGDIR%,${swift_log_dir}," $FILES/swift/rsyslog.conf | sudo \
         tee /etc/rsyslog.d/10-swift.conf
+    # restart syslog to take the changes
+    sudo killall -HUP rsyslogd
+
     if is_apache_enabled_service swift; then
         _config_swift_apache_wsgi
     fi
@@ -627,8 +630,6 @@ function install_swiftclient {
 
 # start_swift() - Start running processes, including screen
 function start_swift {
-    # (re)start rsyslog
-    restart_service rsyslog
     # (re)start memcached to make sure we have a clean memcache.
     restart_service memcached