cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aprat...@apache.org
Subject git commit: updated refs/heads/4.5 to 9875803
Date Mon, 30 Mar 2015 06:58:40 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 6f2facfa3 -> 9875803cf


CLOUDSTACK-6885: rotate logs hourly on VR


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

Branch: refs/heads/4.5
Commit: 9875803cf7a69586b58017cd320e42c10806f7e5
Parents: 6f2facf
Author: Abhinandan Prateek <abhinandan.prateek@shapeblue.com>
Authored: Mon Mar 30 11:36:11 2015 +0530
Committer: Abhinandan Prateek <abhinandan.prateek@shapeblue.com>
Committed: Mon Mar 30 11:36:11 2015 +0530

----------------------------------------------------------------------
 systemvm/patches/debian/config/etc/init.d/cloud-early-config | 4 ++++
 systemvm/patches/debian/config/etc/logrotate.conf            | 2 +-
 systemvm/patches/debian/config/etc/logrotate.d/cloud         | 3 ---
 systemvm/patches/debian/config/etc/logrotate.d/rsyslog       | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9875803c/systemvm/patches/debian/config/etc/init.d/cloud-early-config
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/init.d/cloud-early-config b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
index dcd49cb..b60944a 100755
--- a/systemvm/patches/debian/config/etc/init.d/cloud-early-config
+++ b/systemvm/patches/debian/config/etc/init.d/cloud-early-config
@@ -993,6 +993,10 @@ setup_router() {
   sed -i "s/-A INPUT -i eth0 -p udp -m udp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p udp -m
udp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules
   sed -i "s/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p tcp -m
tcp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules.v4
   sed -i "s/-A INPUT -i eth0 -p tcp -m tcp --dport 53 -j ACCEPT/-A INPUT -i eth0 -p tcp -m
tcp --dport 53 -s $DHCP_RANGE\/$CIDR_SIZE -j ACCEPT/g" /etc/iptables/rules
+
+  #setup hourly logrotate
+  mv -n /etc/cron.daily/logrotate /etc/cron.hourly 2>&1
+  
 }
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9875803c/systemvm/patches/debian/config/etc/logrotate.conf
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/logrotate.conf b/systemvm/patches/debian/config/etc/logrotate.conf
index 59a6242..6b5fcc6 100644
--- a/systemvm/patches/debian/config/etc/logrotate.conf
+++ b/systemvm/patches/debian/config/etc/logrotate.conf
@@ -5,7 +5,7 @@ rotate 5
 # create new (empty) log files after rotating old ones
 create
 # use date as a suffix of the rotated file
-dateext
+#dateext
 # max size 50M
 size 50M
 # RPM packages drop log rotation information into this directory

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9875803c/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 617b09b..5d95942 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/cloud
+++ b/systemvm/patches/debian/config/etc/logrotate.d/cloud
@@ -21,7 +21,4 @@
         notifempty
         compress
         delaycompress
-        postrotate
-                /usr/bin/pkill socat > /dev/null
-        endscript
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9875803c/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 faa8776..5803c43 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/rsyslog
+++ b/systemvm/patches/debian/config/etc/logrotate.d/rsyslog
@@ -2,6 +2,7 @@
 {
 	rotate 7
 	daily
+	size 50M
 	missingok
 	notifempty
 	delaycompress
@@ -26,6 +27,7 @@
 {
 	rotate 10
 	daily
+	size 50M
 	missingok
 	notifempty
 	compress


Mime
View raw message