[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

Nicolas DUPEUX nicolas.dupeux at arkea.com
Tue Feb 28 22:08:45 UTC 2012


The following commit has been merged in the debian/master branch:
commit 91b120ed69fca3062009273765da8d58078a03f7
Author: Nicolas DUPEUX <nicolas.dupeux at arkea.com>
Date:   Wed Dec 14 16:16:36 2011 +0100

    Fix a loop when the client initiate the socket closing

diff --git a/shinken/modules/nsca.py b/shinken/modules/nsca.py
index d7420d7..2420b44 100644
--- a/shinken/modules/nsca.py
+++ b/shinken/modules/nsca.py
@@ -167,6 +167,11 @@ class NSCA_arbiter(BaseModule):
                 else:
                     # handle all other sockets
                     data = s.recv(size)
+                    if len(data) == 0:
+                        # Closed socket
+                        s.close()
+                        input.remove(s)
+                        continue
                     if s in databuffer:
                         databuffer[s] += data
                     else:

-- 
UNNAMED PROJECT



More information about the Pkg-nagios-changes mailing list