Merge "Copy the logs out of the container"

This commit is contained in:
Jenkins 2016-03-09 04:17:50 +00:00 committed by Gerrit Code Review
commit f14b931286
4 changed files with 6 additions and 5 deletions

View File

@ -6,9 +6,11 @@ type = "FileOutput"
message_matcher = "Fields[programname] =~ /(?i:haproxy)/"
path = "/var/log/kolla/haproxy/haproxy.log"
encoder = "syslog_encoder"
folder_perm = "755"
[keepalived_file_output]
type = "FileOutput"
message_matcher = "Fields[programname] =~ /(?i:keepalived)/"
path = "/var/log/kolla/haproxy/keepalived.log"
encoder = "syslog_encoder"
folder_perm = "755"

View File

@ -6,3 +6,4 @@ type = "FileOutput"
message_matcher = "Fields[programname] == '{{ item }}'"
path = "/var/log/kolla/swift/{{ item }}.log"
encoder = "syslog_encoder"
folder_perm = "755"

View File

@ -9,7 +9,7 @@ export KOLLA_BASE=$1
export KOLLA_TYPE=$2
function copy_logs {
docker cp heka:/var/log/kolla /tmp/logs
cp -rnL /var/lib/docker/volumes/kolla_logs/_data/* /tmp/logs/kolla/
}
function check_failure {
@ -41,9 +41,7 @@ function check_failure {
nova list
nova list | awk '/4/ {print $2}' | xargs -n1 nova show
# NOTE(SamYaple): The copy logs functions is put on hold until Heka is all
# merged in. At that point we will pull the logs from Heka's volume
#copy_logs
copy_logs
}
function write_configs {

View File

@ -103,7 +103,7 @@ function setup_logging {
# For ease of access we symlink that logs directory to a known path
ln -s $(pwd)/logs /tmp/logs
mkdir -p /tmp/logs/{ansible,build}
mkdir -p /tmp/logs/{ansible,build,kolla}
}
setup_logging