Repository: cloudstack Updated Branches: refs/heads/master 88cd18227 -> 1dd866068
systemvm, logrotate: remove daily explicitly as it is ignored If the size directive is used, logrotate will ignore the daily, weekly, monthly, and yearly directives. remove cloud-cleanup This script does not do anything because it fails due missing /var/log/cloud directory. Logrotate is used for this functionality. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1889e399 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1889e399 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1889e399 Branch: refs/heads/master Commit: 1889e399dd7fc6e0e9dbac2595cfce0da7858416 Parents: 4d57ec0 Author: Rene Moser <[email protected]> Authored: Tue Feb 16 11:21:30 2016 +0100 Committer: Rene Moser <[email protected]> Committed: Wed May 4 00:23:30 2016 +0200 ---------------------------------------------------------------------- .../debian/config/etc/cron.daily/cloud-cleanup | 27 -------------------- .../patches/debian/config/etc/logrotate.d/cloud | 5 ++-- .../debian/config/etc/logrotate.d/conntrackd | 1 - .../debian/config/etc/logrotate.d/dnsmasq | 1 - .../debian/config/etc/logrotate.d/haproxy | 3 +-- .../patches/debian/config/etc/logrotate.d/ppp | 1 - .../debian/config/etc/logrotate.d/rsyslog | 2 -- 7 files changed, 3 insertions(+), 37 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1889e399/systemvm/patches/debian/config/etc/cron.daily/cloud-cleanup ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/etc/cron.daily/cloud-cleanup b/systemvm/patches/debian/config/etc/cron.daily/cloud-cleanup deleted file mode 100755 index 9d254d3..0000000 --- a/systemvm/patches/debian/config/etc/cron.daily/cloud-cleanup +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/sh -# /etc/cron.daily/cloud-cleanup: cleanup old cloudstack logs -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -cd / -output=$(find /var/log/cloud -mtime +7 -size +1M -exec rm -v '{}' \; ) -logger -t cloud "cloud-cleanup cronjob: cleaning up logfiles in /var/log/cloud older than 7 days and more than 1M in size" - -[ "$output" != "" ] && logger -t cloud $output -[ -z "$output" ] && logger -t cloud "No files removed" - -exit 0 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1889e399/systemvm/patches/debian/config/etc/logrotate.d/cloud ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/etc/logrotate.d/cloud b/systemvm/patches/debian/config/etc/logrotate.d/cloud index 420fce2..3fedd5e 100644 --- a/systemvm/patches/debian/config/etc/logrotate.d/cloud +++ b/systemvm/patches/debian/config/etc/logrotate.d/cloud @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -16,7 +16,6 @@ # under the License. /var/log/cloud.log { rotate 4 - daily size 10M missingok notifempty http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1889e399/systemvm/patches/debian/config/etc/logrotate.d/conntrackd ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd b/systemvm/patches/debian/config/etc/logrotate.d/conntrackd index 0229cd7..1c37c4c 100644 --- a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd +++ b/systemvm/patches/debian/config/etc/logrotate.d/conntrackd @@ -1,5 +1,4 @@ /var/log/conntrackd-stats.log { - daily size 10M rotate 2 missingok http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1889e399/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq index 2f91785..99815d8 100644 --- a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq +++ b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq @@ -1,5 +1,4 @@ /var/log/dnsmasq.log { - daily size 10M missingok rotate 5 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1889e399/systemvm/patches/debian/config/etc/logrotate.d/haproxy ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/etc/logrotate.d/haproxy b/systemvm/patches/debian/config/etc/logrotate.d/haproxy index 858fe2a..28da41c 100644 --- a/systemvm/patches/debian/config/etc/logrotate.d/haproxy +++ b/systemvm/patches/debian/config/etc/logrotate.d/haproxy @@ -1,10 +1,9 @@ /var/log/haproxy.log { - daily rotate 5 missingok notifempty size 10M - postrotate + postrotate /bin/kill -HUP `cat /var/run/rsyslog.pid 2> /dev/null` 2> /dev/null || true endscript } http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1889e399/systemvm/patches/debian/config/etc/logrotate.d/ppp ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/etc/logrotate.d/ppp b/systemvm/patches/debian/config/etc/logrotate.d/ppp index 2004e77..624b4ae 100644 --- a/systemvm/patches/debian/config/etc/logrotate.d/ppp +++ b/systemvm/patches/debian/config/etc/logrotate.d/ppp @@ -1,5 +1,4 @@ /var/log/ppp-connect-errors { - daily size 10M rotate 5 missingok http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1889e399/systemvm/patches/debian/config/etc/logrotate.d/rsyslog ---------------------------------------------------------------------- diff --git a/systemvm/patches/debian/config/etc/logrotate.d/rsyslog b/systemvm/patches/debian/config/etc/logrotate.d/rsyslog index 5803c43..5a104b3 100644 --- a/systemvm/patches/debian/config/etc/logrotate.d/rsyslog +++ b/systemvm/patches/debian/config/etc/logrotate.d/rsyslog @@ -1,7 +1,6 @@ /var/log/syslog { rotate 7 - daily size 50M missingok notifempty @@ -26,7 +25,6 @@ /var/log/messages { rotate 10 - daily size 50M missingok notifempty
