Module: check_mk
Branch: master
Commit: 8ae84c5bfcb65970a5b5916345e5e0380867c886
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8ae84c5bfcb659…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Thu Jul 11 13:17:45 2013 +0200
Fixed problem in latest mkeventd changes ; changed snmptrap port to the default one
---
mkeventd/bin/mkeventd | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd
index 62d37b4..8fcf6da 100755
--- a/mkeventd/bin/mkeventd
+++ b/mkeventd/bin/mkeventd
@@ -803,7 +803,7 @@ class EventServer:
else:
self._snmptrap = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
self._snmptrap.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
- self._snmptrap.bind(("0.0.0.0", 1612))
+ self._snmptrap.bind(("0.0.0.0", 612))
log("Opened builtin snmptrap server on UDP port 612")
except Exception, e:
raise Exception("Cannot start builtin snmptrap server: %s" %
e)
@@ -994,7 +994,7 @@ class EventServer:
client_sockets[client_socket.fileno()] = (client_socket, "")
# Same for the TCP syslog socket
- if self._syslog_tcp.fileno() in readable:
+ if self._syslog_tcp and self._syslog_tcp.fileno() in readable:
client_socket, addr_info = self._syslog_tcp.accept()
client_sockets[client_socket.fileno()] = (client_socket, "")