cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From raj...@apache.org
Subject [09/10] git commit: updated refs/heads/master to fa85151
Date Tue, 28 Feb 2017 00:20:49 GMT
Merge release branch 4.8 to 4.9

* 4.8:
  CLOUDSTACK-9746 system-vm: logrotate config causes critical failures


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b95bf8fc
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b95bf8fc
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b95bf8fc

Branch: refs/heads/master
Commit: b95bf8fcd8a2e6b0966e62a35ed6bc9a0a86ab1f
Parents: d9bd012 113ce13
Author: Rajani Karuturi <rajani.karuturi@accelerite.com>
Authored: Tue Feb 28 05:45:31 2017 +0530
Committer: Rajani Karuturi <rajani.karuturi@accelerite.com>
Committed: Tue Feb 28 05:45:31 2017 +0530

----------------------------------------------------------------------
 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/b95bf8fc/systemvm/patches/debian/config/etc/logrotate.d/cloud
----------------------------------------------------------------------
diff --cc systemvm/patches/debian/config/etc/logrotate.d/cloud
index 3fedd5e,bf0ec74..8bda52c
--- a/systemvm/patches/debian/config/etc/logrotate.d/cloud
+++ b/systemvm/patches/debian/config/etc/logrotate.d/cloud
@@@ -15,8 -15,9 +15,8 @@@
  # specific language governing permissions and limitations
  # under the License.
  /var/log/cloud.log {
-         rotate 4
-         size 10M
+         rotate 10
 -        daily
+         maxsize 10M
          missingok
          notifempty
          compress

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b95bf8fc/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
----------------------------------------------------------------------
diff --cc systemvm/patches/debian/config/etc/logrotate.d/conntrackd
index 1c37c4c,89f560d..8b5ff66
--- a/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
+++ b/systemvm/patches/debian/config/etc/logrotate.d/conntrackd
@@@ -1,5 -1,6 +1,5 @@@
  /var/log/conntrackd-stats.log {
-     size 10M
 -    daily
+     maxsize 10M
      rotate 2
      missingok
      compress

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b95bf8fc/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
----------------------------------------------------------------------
diff --cc systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
index 99815d8,9fb70f0..8a797e9
--- a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
+++ b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
@@@ -1,5 -1,6 +1,5 @@@
  /var/log/dnsmasq.log {
-     size 10M
 -    daily
+     maxsize 10M
      missingok
      rotate 5
      notifempty

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b95bf8fc/systemvm/patches/debian/config/etc/logrotate.d/haproxy
----------------------------------------------------------------------
diff --cc systemvm/patches/debian/config/etc/logrotate.d/haproxy
index 28da41c,1c8110b..4642097
--- a/systemvm/patches/debian/config/etc/logrotate.d/haproxy
+++ b/systemvm/patches/debian/config/etc/logrotate.d/haproxy
@@@ -2,8 -2,9 +2,8 @@@
      rotate 5
      missingok
      notifempty
-     size 10M
+     maxsize 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/b95bf8fc/systemvm/patches/debian/config/etc/logrotate.d/ppp
----------------------------------------------------------------------
diff --cc systemvm/patches/debian/config/etc/logrotate.d/ppp
index 624b4ae,2d70f6a..ce02c17
--- a/systemvm/patches/debian/config/etc/logrotate.d/ppp
+++ b/systemvm/patches/debian/config/etc/logrotate.d/ppp
@@@ -1,5 -1,6 +1,5 @@@
  /var/log/ppp-connect-errors {
- 	size 10M
 -	daily
+ 	maxsize 10M
  	rotate 5
  	missingok
  	notifempty

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b95bf8fc/systemvm/patches/debian/config/etc/logrotate.d/rsyslog
----------------------------------------------------------------------
diff --cc systemvm/patches/debian/config/etc/logrotate.d/rsyslog
index 5a104b3,9397f41..9291494
--- a/systemvm/patches/debian/config/etc/logrotate.d/rsyslog
+++ b/systemvm/patches/debian/config/etc/logrotate.d/rsyslog
@@@ -1,10 -1,10 +1,9 @@@
  /var/log/syslog
  {
  	rotate 7
- 	size 50M
 -	daily
+ 	maxsize 10M
  	missingok
  	notifempty
- 	delaycompress
  	compress
  	postrotate
  		/usr/sbin/invoke-rc.d rsyslog rotate > /dev/null
@@@ -25,7 -25,8 +24,7 @@@
  /var/log/messages
  {
  	rotate 10
- 	size 50M
 -	daily
+ 	maxsize 10M
  	missingok
  	notifempty
  	compress


Mime
View raw message