openstack/devstack
Code Issues Proposed changes

Merge "move the rsyslogd restart"

Browse Source
This commit is contained in:
Jenkins 2014-03-21 06:30:42 +00:00 committed by Gerrit Code Review
commit 52e165af79
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/swift
View File

@ -455,6 +455,9 @@ EOF
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 \ sed "s,%SWIFT_LOGDIR%,${swift_log_dir}," $FILES/swift/rsyslog.conf | sudo \
tee /etc/rsyslog.d/10-swift.conf tee /etc/rsyslog.d/10-swift.conf
# restart syslog to take the changes
sudo killall -HUP rsyslogd
if is_apache_enabled_service swift; then if is_apache_enabled_service swift; then
_config_swift_apache_wsgi _config_swift_apache_wsgi
fi fi
@ -628,8 +631,6 @@ function install_swiftclient {
# start_swift() - Start running processes, including screen # start_swift() - Start running processes, including screen
function start_swift { function start_swift {
# (re)start rsyslog
restart_service rsyslog
# (re)start memcached to make sure we have a clean memcache. # (re)start memcached to make sure we have a clean memcache.
restart_service memcached restart_service memcached