Module: check_mk Branch: master Commit: 79ea70e9871c4974ba42b5d5602169f73315420b URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79ea70e9871c49… Author: Goetz Golla &lt;gg(a)mathias-kettner.de&gt; Date: Wed May 21 15:50:34 2014 +0200 FIX liveproxyd: fewer log messages in case a site is unreachable --- .werks/613 | 8 ++++++++ ChangeLog | 1 + doc/treasures/liveproxy/liveproxyd | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.werks/613 b/.werks/613 new file mode 100644 index 0000000..a32578b --- /dev/null +++ b/.werks/613 @@ -0,0 +1,8 @@ +Title: liveproxyd: fewer log messages in case a site is unreachable +Level: 1 +Component: reporting +Version: 1.2.5i3 +Date: 1400679878 +Class: fix + + diff --git a/ChangeLog b/ChangeLog index c5ccf4c..40b1486 100644 --- a/ChangeLog +++ b/ChangeLog @@ -124,6 +124,7 @@ * 0966 CSV export for availability works now also for BI aggregates * 0967 BI Availability timewarp: new buttons for moving back and forth * 0962 FIX: Fix CSV-Export in availability table + * 0613 FIX: liveproxyd: fewer log messages in case a site is unreachable Event Console: * 0885 New option for writing all messages into a syslog-like logfile... diff --git a/doc/treasures/liveproxy/liveproxyd b/doc/treasures/liveproxy/liveproxyd index 946cc96..ed9f254 100755 --- a/doc/treasures/liveproxy/liveproxyd +++ b/doc/treasures/liveproxy/liveproxyd @@ -154,7 +154,7 @@ def do_heartbeats(): if now - since >= rate: if not send_heartbeat(sitename, sitestate): if now - since >= 2 * rate: - log("Could not send heartbeat for %d secs - no free channel" % (2 * rate)) + log("Could not send heartbeat to %s for %d secs - no free channel" % ( sitename, (2 * rate))) disconnect_from_site(sitename) @@ -169,7 +169,7 @@ def send_heartbeat(sitename, sitestate): if next_channel == None or channel["since"] < next_channel["since"]: next_channel = channel if not next_channel: - log("Cannot send heartbeat to %s: no channel ready" % sitename) + #log("Cannot send heartbeat to %s: no channel ready" % sitename) return False else: