From 86e356d2313e2419823056d798affc105b045136 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Fri, 26 Jul 2013 22:36:47 -0500
Subject: xymon: Make logrotate wildcard more restrictive so multiple .1 files
aren't created. refs #913.
Change the name of the mtc log to mtc.log. Remove the old mtc log and mtc.1 files.
---
abs/core/xymon/PKGBUILD | 10 +++++-----
abs/core/xymon/logrotate-client.xymon | 2 +-
abs/core/xymon/logrotate-server.xymon | 2 +-
abs/core/xymon/tasks.d.mv | 2 +-
abs/core/xymon/xymon.install | 5 +++--
5 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/abs/core/xymon/PKGBUILD b/abs/core/xymon/PKGBUILD
index a197b03..a0540d3 100755
--- a/abs/core/xymon/PKGBUILD
+++ b/abs/core/xymon/PKGBUILD
@@ -1,14 +1,14 @@
pkgbase=xymon
pkgname=(xymonserver xymonclient)
pkgver=4.3.5
-pkgrel=46
+pkgrel=47
pkgdesc="Hobbit is a system for monitoring servers and networks. "
license="GPL"
arch=('i686' 'x86_64')
url="http://www.xymon.com/"
-source=(http://voxel.dl.sourceforge.net/project/xymon/Xymon/4.3.5/xymon-4.3.5.tar.gz hobbitadd.py xymon_ghost_check graph.cfg.diff xymonserver.cfg.diff tasks.d.mv clientlaunch.cfg.patch hobbitstorage.py hbnotes.py hobbit-myth-orphan.sh analysis.cfg hbfunc.py be.png tuner.png tv.png hobbit-mem-myth.sh hobbit_notify.sh alerts.cfg hobbit_myth_data.py logrotate-server.xymon logrotate-client.xymon log_list.sh client-local.cfg.patch led_themes.tar.gz xymon-server.rules hosts.cfg.patch)
+source=(http://hivelocity.dl.sourceforge.net/project/xymon/Xymon/4.3.5/xymon-4.3.5.tar.gz hobbitadd.py xymon_ghost_check graph.cfg.diff xymonserver.cfg.diff tasks.d.mv clientlaunch.cfg.patch hobbitstorage.py hbnotes.py hobbit-myth-orphan.sh analysis.cfg hbfunc.py be.png tuner.png tv.png hobbit-mem-myth.sh hobbit_notify.sh alerts.cfg hobbit_myth_data.py logrotate-server.xymon logrotate-client.xymon log_list.sh client-local.cfg.patch led_themes.tar.gz xymon-server.rules hosts.cfg.patch)
depends=(rrdtool fping pcre python2 graphviz 'linhes-scripts>=7-24')
@@ -125,7 +125,7 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
'c60b0d59bb39505ee3d62c6dd65429c5'
'a45dd4cdb84817bcf3e51b25cc713799'
'034658a1084510ecbbb0dc166c0401eb'
- '2d88e59ab17114030da514ba3f0a5b64'
+ '758cdd9f1ba5ae3e1b42e811172806f3'
'ee608dcafc050d790e28647a670f6b60'
'b2f98ac0df013332deedc1efae0a270d'
'fc24435b97254f0954233319ba09689b'
@@ -139,8 +139,8 @@ md5sums=('31923ec126fe1c264fceb459d2175161'
'622f400fd098cbc43c203e3210a6694e'
'84442377c6e914b65519076bda4e17a4'
'd7116dc59319b893e90a26e6beb83994'
- '0a63d66de7e74daef24899da0a4042ab'
- '7ad4871af35f82c7824bb682b9325dba'
+ 'b4e8641e97e6b689dbc634af785e6799'
+ 'e2844513e2c92e8b5084818f3b2a478d'
'98e9242ae346f729b14cb195786571f2'
'31ac5c1f6dcc9408b64c4107b325a9a6'
'c7178bbf384bbe86c318b60fef6faf10'
diff --git a/abs/core/xymon/logrotate-client.xymon b/abs/core/xymon/logrotate-client.xymon
index 0fadb2e..ba48a0f 100755
--- a/abs/core/xymon/logrotate-client.xymon
+++ b/abs/core/xymon/logrotate-client.xymon
@@ -1,4 +1,4 @@
-/home/xymon/client/logs/* {
+/home/xymon/client/logs/*.log {
missingok
notifempty
size 512k
diff --git a/abs/core/xymon/logrotate-server.xymon b/abs/core/xymon/logrotate-server.xymon
index cdbf339..a231470 100644
--- a/abs/core/xymon/logrotate-server.xymon
+++ b/abs/core/xymon/logrotate-server.xymon
@@ -1,4 +1,4 @@
-/var/log/hobbit/* {
+/var/log/hobbit/*.log /var/log/hobbit/*.pid {
missingok
notifempty
size 512k
diff --git a/abs/core/xymon/tasks.d.mv b/abs/core/xymon/tasks.d.mv
index e113f37..5ea7841 100644
--- a/abs/core/xymon/tasks.d.mv
+++ b/abs/core/xymon/tasks.d.mv
@@ -30,7 +30,7 @@
[mtc]
ENVFILE /home/xymon/server/etc/xymonserver.cfg
CMD /home/xymon/server/ext/hobbit_myth_data.py
- LOGFILE $BBSERVERLOGS/mtc
+ LOGFILE $BBSERVERLOGS/mtc.log
INTERVAL 5m
[ghost]
ENVFILE /home/xymon/server/etc/xymonserver.cfg
diff --git a/abs/core/xymon/xymon.install b/abs/core/xymon/xymon.install
index 90af45b..62feb36 100755
--- a/abs/core/xymon/xymon.install
+++ b/abs/core/xymon/xymon.install
@@ -32,8 +32,9 @@ post_install() {
chown root /home/xymon/server/bin/xymonping
chmod +s /home/xymon/server/bin/xymonping
-
-
+ #remove old mtc log files
+ rm -f /var/log/hobbit/mtc
+ rm -f /var/log/hobbit/mtc.1*
}
--
cgit v0.12