Module: check_mk
Branch: master
Commit: b56fa06f76f3dc3902c600e3ae4f09f49f6f767e
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=b56fa06f76f3dc…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Tue Jan 7 09:39:42 2014 +0100
FIX Fixed exception when handling connections from event unix socket
This issue has been introduced in december of 2013. It made the event
console terminate with an exception with a message like
<tt>AttributeError: 'tuple' object has no attribute
'close'</tt>. This
has been fixed now.
---
.werks/427 | 13 +++++++++++++
ChangeLog | 1 +
mkeventd/bin/mkeventd | 2 +-
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/.werks/427 b/.werks/427
new file mode 100644
index 0000000..f822ce4
--- /dev/null
+++ b/.werks/427
@@ -0,0 +1,13 @@
+Title: Fixed exception when handling connections from event unix socket
+Level: 2
+Component: ec
+Class: fix
+State: unknown
+Version: 1.2.5i1
+Date: 1389083880
+Targetversion: future
+
+This issue has been introduced in december of 2013. It made the event
+console terminate with an exception with a message like
+<tt>AttributeError: 'tuple' object has no attribute
'close'</tt>. This
+has been fixed now.
diff --git a/ChangeLog b/ChangeLog
index 408da54..6371a30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -155,6 +155,7 @@
* 0089 FIX: CSV export of event console was broken...
* 0359 FIX: Fixed exception in event simulator when one match group did not match
* 0384 FIX: Trying to prevent problem when restarting mkeventd...
+ * 0427 FIX: Fixed exception when handling connections from event unix socket...
Livestatus:
* 0337 New header for limiting the execution time of a query...
diff --git a/mkeventd/bin/mkeventd b/mkeventd/bin/mkeventd
index 1f11de9..5b87b74 100755
--- a/mkeventd/bin/mkeventd
+++ b/mkeventd/bin/mkeventd
@@ -1001,7 +1001,7 @@ class EventServer:
# Accept new connection on event unix socket
if self._eventsocket in readable:
client_socket, address = self._eventsocket.accept()
- client_sockets[client_socket.fileno()] = (self._eventsocket.accept(),
address, "")
+ client_sockets[client_socket.fileno()] = (client_socket, address,
"")
# Same for the TCP syslog socket
if self._syslog_tcp and self._syslog_tcp in readable: