openstack/devstack
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Jenkins 2014-04-17 21:19:44 +00:00 committed by Gerrit Code Review
commit 6ee8cf8e72
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/swift
View File

@ -453,10 +453,13 @@ EOF
rm -rf ${swift_log_dir} rm -rf ${swift_log_dir}
mkdir -p ${swift_log_dir}/hourly mkdir -p ${swift_log_dir}/hourly
sudo chown -R ${STACK_USER}:adm ${swift_log_dir} 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 if [[ $SYSLOG != "False" ]]; then
# restart syslog to take the changes sed "s,%SWIFT_LOGDIR%,${swift_log_dir}," $FILES/swift/rsyslog.conf | sudo \
sudo killall -HUP rsyslogd 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 if is_apache_enabled_service swift; then
_config_swift_apache_wsgi _config_swift_apache_wsgi