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

[olivierHa]

The following commit has been merged in the debian/master branch:
commit 2d397ead59b91baf967bab82a839d62f93e727b6
Author: olivierHa <olivier.hanesse at gmail.com>
Date:   Wed Jan 4 14:10:00 2012 +0100

    fix: pyro error handling

diff --git a/shinken/satellite.py b/shinken/satellite.py
index 40cbd65..744d9cd 100644
--- a/shinken/satellite.py
+++ b/shinken/satellite.py
@@ -618,7 +618,7 @@ class Satellite(BaseSatellite):
                     self.pynag_con_init(sched_id)
             # Ok, con is not know, so we create it
             # Or maybe is the connection lost, we recreate it
-            except (KeyError, Pyro.errors.ProtocolError, Pyro.errors.ConnectionClosedError) , exp:
+            except (Pyro_exp_pack, KeyError) , exp:
                 print exp
                 self.pynag_con_init(sched_id)
             # scheduler must not be initialized
@@ -628,9 +628,12 @@ class Satellite(BaseSatellite):
             # What the F**k? We do not know what happenned,
             # so.. bye bye :)
             except Exception , exp:
-               print "Unknown exception", exp
+               print "Unknown exception", exp, type(exp)
                try:
-                  print ''.join(Pyro.util.getPyroTraceback(exp))
+                  if PYRO_VERSION < "4.0":
+                      print ''.join(Pyro.util.getPyroTraceback(exp))
+                  else:
+                      print ''.join(Pyro.util.getPyroTraceback())
                except:
                   pass
                raise

-- 
UNNAMED PROJECT