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

[Naparuba]

The following commit has been merged in the debian/master branch:
commit c33cb98e0b03ad5cad2eee8ddd089b2ce80924f5
Author: Naparuba <naparuba at gmail.com>
Date:   Thu Jan 5 08:19:56 2012 +0100

    Fix (reported by titilambert): catch Pyro.errors.TimeoutError in satellite.py too.

diff --git a/shinken/daemons/brokerdaemon.py b/shinken/daemons/brokerdaemon.py
index eed4f2b..fd08dcf 100644
--- a/shinken/daemons/brokerdaemon.py
+++ b/shinken/daemons/brokerdaemon.py
@@ -41,10 +41,11 @@ from shinken.pyro_wrapper import Pyro
 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.TimeoutError)
+#Pyro_exp_pack = (Pyro.errors.ProtocolError, Pyro.errors.URIError, \
+#                    Pyro.errors.CommunicationError, \
+#                    Pyro.errors.DaemonError, Pyro.errors.TimeoutError)
 
+from shinken.pyro_wrapper import Pyro_exp_pack
 
 # Our main APP class
 class Broker(BaseSatellite):
diff --git a/shinken/objects/item.py b/shinken/objects/item.py
index 793fbe4..f90dd2e 100644
--- a/shinken/objects/item.py
+++ b/shinken/objects/item.py
@@ -1367,7 +1367,6 @@ def hg_name_get_groupnames(all_res, hosts, hostgroups, res=None, look_in='hostgr
                 # So first find the template, and then get all it's
                 # hosts
                 members = hosts.find_hosts_that_use_template(tok)
-                print "GOT COMPLEX HOST MEMBERS", members
             # TODO: check why:
             # sometimes we get a list, sometimes we get a string of hosts name which are ',' separated..
             if isinstance(members, list):
diff --git a/shinken/pyro_wrapper.py b/shinken/pyro_wrapper.py
index ee4a2ad..d2b794f 100644
--- a/shinken/pyro_wrapper.py
+++ b/shinken/pyro_wrapper.py
@@ -233,3 +233,12 @@ class ShinkenPyroDaemon(PyroClass):
                 return []
             raise
         return ins
+
+
+
+
+# Common exceptions to be catch
+Pyro_exp_pack = (Pyro.errors.ProtocolError, Pyro.errors.URIError, \
+                    Pyro.errors.CommunicationError, \
+                    Pyro.errors.DaemonError, Pyro.errors.ConnectionClosedError, \
+                    Pyro.errors.TimeoutError)
diff --git a/shinken/satellite.py b/shinken/satellite.py
index 744d9cd..73528ce 100644
--- a/shinken/satellite.py
+++ b/shinken/satellite.py
@@ -77,9 +77,7 @@ from shinken.eventhandler import EventHandler
 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.ConnectionClosedError)
+from shinken.pyro_wrapper import Pyro_exp_pack
 
 
 # Class for say we are facing a non worker module

-- 
UNNAMED PROJECT