You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2017/02/28 00:21:42 UTC
[4/9] git commit: updated refs/heads/4.9 to b95bf8f
CLOUDSTACK-9746 system-vm: logrotate config causes critical failures
* rotate both daily and by size by using maxsize in stead of size
* decrease the max size to 10M for rsyslog files
* remove delaycompress for rsyslog files
* increase rotate to 10 for cloud.log
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5604b4c5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5604b4c5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5604b4c5
Branch: refs/heads/4.9
Commit: 5604b4c59e73472d3aa14d08c27a9e1bf1a7948b
Parents: a13ee85
Author: Joakim Sernbrant <jo...@trioptima.com>
Authored: Tue Feb 21 16:39:42 2017 +0100
Committer: Joakim Sernbrant <jo...@trioptima.com>
Committed: Wed Feb 22 11:04:52 2017 +0100
----------------------------------------------------------------------
systemvm/patches/debian/config/etc/logrotate.d/apache2 | 2 +-
systemvm/patches/debian/config/etc/logrotate.d/cloud | 4 ++--
systemvm/patches/debian/config/etc/logrotate.d/conntrackd | 2 +-
systemvm/patches/debian/config/etc/logrotate.d/dnsmasq | 2 +-
systemvm/patches/debian/config/etc/logrotate.d/haproxy | 2 +-
systemvm/patches/debian/config/etc/logrotate.d/ppp | 2 +-
systemvm/patches/debian/config/etc/logrotate.d/rsyslog | 6 ++----
7 files changed, 9 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5604b4c5/systemvm/patches/debian/config/etc/logrotate.d/apache2
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/apache2 b/systemvm/patches/debian/config/etc/logrotate.d/apache2
index 3932c27..58ddb4d 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/apache2
+++ b/systemvm/patches/debian/config/etc/logrotate.d/apache2
@@ -4,6 +4,6 @@
rotate 3
compress
dateext
- size 10M
+ maxsize 10M
notifempty
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5604b4c5/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..bf0ec74 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/cloud
+++ b/systemvm/patches/debian/config/etc/logrotate.d/cloud
@@ -15,9 +15,9 @@
# specific language governing permissions and limitations
# under the License.
/var/log/cloud.log {
- rotate 4
+ rotate 10
daily
- size 10M
+ maxsize 10M
missingok
notifempty
compress
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5604b4c5/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..89f560d 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
+++ b/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
@@ -1,6 +1,6 @@
/var/log/conntrackd-stats.log {
daily
- size 10M
+ maxsize 10M
rotate 2
missingok
compress
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5604b4c5/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..9fb70f0 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
+++ b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
@@ -1,6 +1,6 @@
/var/log/dnsmasq.log {
daily
- size 10M
+ maxsize 10M
missingok
rotate 5
notifempty
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5604b4c5/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..1c8110b 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/haproxy
+++ b/systemvm/patches/debian/config/etc/logrotate.d/haproxy
@@ -3,7 +3,7 @@
rotate 5
missingok
notifempty
- size 10M
+ maxsize 10M
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/5604b4c5/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..2d70f6a 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/ppp
+++ b/systemvm/patches/debian/config/etc/logrotate.d/ppp
@@ -1,6 +1,6 @@
/var/log/ppp-connect-errors {
daily
- size 10M
+ maxsize 10M
rotate 5
missingok
notifempty
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5604b4c5/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..9397f41 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/rsyslog
+++ b/systemvm/patches/debian/config/etc/logrotate.d/rsyslog
@@ -2,10 +2,9 @@
{
rotate 7
daily
- size 50M
+ maxsize 10M
missingok
notifempty
- delaycompress
compress
postrotate
/usr/sbin/invoke-rc.d rsyslog rotate > /dev/null
@@ -27,11 +26,10 @@
{
rotate 10
daily
- size 50M
+ maxsize 10M
missingok
notifempty
compress
- delaycompress
sharedscripts
postrotate
/usr/sbin/invoke-rc.d rsyslog rotate > /dev/null