From d97d7c67dc53559c1ea49a312432439001ef83a1 Mon Sep 17 00:00:00 2001 From: chove Date: Wed, 8 Mar 2006 13:02:03 +0100 Subject: [PATCH] 1) on passe 90% pour le pubftp, on a le temps de s'en soucier vu les graphes munin 2) corrections de quelques bugs darcs-hash:20060308120203-4ec08-8b6a4c1561727d43070128c396475a48ddad3df2.gz --- monit/generate.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/monit/generate.py b/monit/generate.py index f7adf050..f53a5b5c 100755 --- a/monit/generate.py +++ b/monit/generate.py @@ -118,10 +118,10 @@ def file_monitrc(hostname = host) : # place sur les disques if (hostname,line[1]) in [('sila','/var/spool/squid1'),('sila','/var/spool/squid2')] : - continue + pass elif (hostname,line[1]) in [('egon','/pubftp')] : config += ' if space usage > 95% then alert\n' - elif (hostname,line[1]) in [('sila','/var/log/squid')] : + elif (hostname,line[1]) in [('sila','/var/log/squid'),('sila','/pubftp')] : config += ' if space usage > 90% then alert\n' else : config += ' if space usage > 80% then alert\n' @@ -379,7 +379,7 @@ def file_monitrc(hostname = host) : config += 'check process privoxy with pidfile /var/run/privoxy.pid\n' config += ' start program = "/etc/init.d/privoxy start"\n' config += ' stop program = "/etc/init.d/privoxy stop"\n' - config += ' if failed host localhost port 8117 timeout %s then restart\n' % timeout + config += ' if failed host localhost port 8117 %s then restart\n' % timeout config += ' if 5 restarts within 5 cycles then timeout\n' config += '\n'