commit 6ee8cf8e72629094fca639ba9da7ebe6e78c0131
author Jenkins <jenkins@review.openstack.org> Thu Apr 17 21:19:44 2014 +0000
committer Gerrit Code Review <review@openstack.org> Thu Apr 17 21:19:44 2014 +0000
tree 1648c9905f5000a3f7d9a9b55b57ebc8daab5e8d
parent 1593db2422007f1e5b41f2ecf0bde89141324cdd
parent f894c2ab805f9dfc0dfdd3668ccd3a83ee4eb9f2

Merge "Do not modify rsyslog files if rsyslog is not used."

lib/swift

diff --git a/lib/swift b/lib/swift
index 3e183ff..6db779a 100644
--- a/lib/swift
+++ b/lib/swift
@@ -453,10 +453,13 @@
     rm -rf ${swift_log_dir}
     mkdir -p ${swift_log_dir}/hourly
     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 [[ $SYSLOG != "False" ]]; then
+        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
+    fi
 
     if is_apache_enabled_service swift; then
         _config_swift_apache_wsgi