Merge "Configure swift logging."

This commit is contained in:
Jenkins 2012-01-05 23:26:53 +00:00 committed by Gerrit Code Review
commit 3ffd5c1222
3 changed files with 43 additions and 2 deletions

View File

@ -1,8 +1,11 @@
[DEFAULT]
bind_port = 8080
user = %USER%
log_facility = LOG_LOCAL1
swift_dir = %SWIFT_CONFIG_LOCATION%
workers = 1
log_name = swift
log_facility = LOG_LOCAL1
log_level = DEBUG
[pipeline:main]
pipeline = healthcheck cache %AUTH_SERVER% proxy-server

26
files/swift/rsyslog.conf Normal file
View File

@ -0,0 +1,26 @@
# Uncomment the following to have a log containing all logs together
#local1,local2,local3,local4,local5.* %SWIFT_LOGDIR%/all.log
# Uncomment the following to have hourly proxy logs for stats processing
#$template HourlyProxyLog,"%SWIFT_LOGDIR%/hourly/%$YEAR%%$MONTH%%$DAY%%$HOUR%"
#local1.*;local1.!notice ?HourlyProxyLog
local1.*;local1.!notice %SWIFT_LOGDIR%/proxy.log
local1.notice %SWIFT_LOGDIR%/proxy.error
local1.* ~
local2.*;local2.!notice %SWIFT_LOGDIR%/storage1.log
local2.notice %SWIFT_LOGDIR%/storage1.error
local2.* ~
local3.*;local3.!notice %SWIFT_LOGDIR%/storage2.log
local3.notice %SWIFT_LOGDIR%/storage2.error
local3.* ~
local4.*;local4.!notice %SWIFT_LOGDIR%/storage3.log
local4.notice %SWIFT_LOGDIR%/storage3.error
local4.* ~
local5.*;local5.!notice %SWIFT_LOGDIR%/storage4.log
local5.notice %SWIFT_LOGDIR%/storage4.error
local5.* ~

View File

@ -868,9 +868,10 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
USER_GROUP=$(id -g)
sudo mkdir -p ${SWIFT_DATA_LOCATION}/drives
sudo chown -R $USER:${USER_GROUP} ${SWIFT_DATA_LOCATION}/drives
sudo chown -R $USER:${USER_GROUP} ${SWIFT_DATA_LOCATION}
# We then create a loopback disk and format it to XFS.
# TODO: Reset disks on new pass.
if [[ ! -e ${SWIFT_DATA_LOCATION}/drives/images/swift.img ]]; then
mkdir -p ${SWIFT_DATA_LOCATION}/drives/images
sudo touch ${SWIFT_DATA_LOCATION}/drives/images/swift.img
@ -964,6 +965,17 @@ if [[ "$ENABLED_SERVICES" =~ "swift" ]]; then
generate_swift_configuration container 6011 2
generate_swift_configuration account 6012 2
# We have some specific configuration for swift for rsyslog. See
# the file /etc/rsyslog.d/10-swift.conf for more info.
swift_log_dir=${SWIFT_DATA_LOCATION}/logs
rm -rf ${swift_log_dir}
mkdir -p ${swift_log_dir}/hourly
sudo chown -R syslog:adm ${swift_log_dir}
sed "s,%SWIFT_LOGDIR%,${swift_log_dir}," $FILES/swift/rsyslog.conf | sudo \
tee /etc/rsyslog.d/10-swift.conf
sudo restart rsyslog
# We create two helper scripts :
#
# - swift-remakerings