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

[Naparuba]

The following commit has been merged in the debian/master branch:
commit 72afdfc57d8f1d26fc3002055bb3397010360eb0
Author: Naparuba <naparuba at gmail.com>
Date:   Wed Dec 21 13:47:00 2011 +0100

    Fix : (reported by : Thibaut Notteboom) catch ConnectionClosedError on poller/reactionner connections

diff --git a/shinken/satellite.py b/shinken/satellite.py
index 644c6a4..6ec5903 100644
--- a/shinken/satellite.py
+++ b/shinken/satellite.py
@@ -79,7 +79,7 @@ from shinken.external_command import ExternalCommand
 # Pack of common Pyro exceptions
 Pyro_exp_pack = (Pyro.errors.ProtocolError, Pyro.errors.URIError, \
                     Pyro.errors.CommunicationError, \
-                    Pyro.errors.DaemonError)
+                    Pyro.errors.DaemonError, Pyro.errors.ConnectionClosedError)
 
 
 # Class for say we are facing a non worker module
@@ -332,13 +332,13 @@ class Satellite(BaseSatellite):
                     if con is not None: # None = not initialized
                         send_ok = con.put_results(ret)
                 # Not connected or sched is gone
-                except (Pyro.errors.ProtocolError, KeyError) , exp:
+                except (Pyro_exp_pack, KeyError) , exp:
                     print exp
                     self.pynag_con_init(sched_id)
                     return
                 except AttributeError , exp: # the scheduler must  not be initialized
                     print exp
-                except Exception , exp:
+                except Exception, exp:
                     print "Unknown exception", exp, type(exp)
                     try:
                        if PYRO_VERSION < "4.0":

-- 
UNNAMED PROJECT