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

[Naparuba]

The following commit has been merged in the debian/master branch:
commit 89afb64c132244dfa148b192860164b3f23e68e0
Author: Naparuba <naparuba at gmail.com>
Date:   Thu Jan 5 09:43:58 2012 +0100

    Fix :(reported by Andreas) Receivers broks were missing.

diff --git a/shinken/daemons/arbiterdaemon.py b/shinken/daemons/arbiterdaemon.py
index d71b034..f3eac5a 100644
--- a/shinken/daemons/arbiterdaemon.py
+++ b/shinken/daemons/arbiterdaemon.py
@@ -182,8 +182,9 @@ class Arbiter(Daemon):
 
     # Our links to satellites can raise broks. We must send them
     def get_broks_from_satellitelinks(self):
-        tabs = [self.conf.brokers, self.conf.schedulerlinks, \
-                    self.conf.pollers, self.conf.reactionners]
+        tabs = [self.conf.brokers, self.conf.schedulerlinks,
+                    self.conf.pollers, self.conf.reactionners,
+                self.conf.receivers]
         for tab in tabs:
             for s in tab:
                 new_broks = s.get_all_broks()
@@ -193,8 +194,9 @@ class Arbiter(Daemon):
 
     # Our links to satellites can raise broks. We must send them
     def get_initial_broks_from_satellitelinks(self):
-        tabs = [self.conf.brokers, self.conf.schedulerlinks, \
-                    self.conf.pollers, self.conf.reactionners]
+        tabs = [self.conf.brokers, self.conf.schedulerlinks,
+                self.conf.pollers, self.conf.reactionners,
+                self.conf.receivers]
         for tab in tabs:
             for s in tab:
                 b  = s.get_initial_status_brok()
diff --git a/shinken/modules/status_dat_broker/objectscache.py b/shinken/modules/status_dat_broker/objectscache.py
index d71a9f9..641a051 100644
--- a/shinken/modules/status_dat_broker/objectscache.py
+++ b/shinken/modules/status_dat_broker/objectscache.py
@@ -267,6 +267,9 @@ class ObjectsCacheFile:
                                     ['%s' % x for x in value if not isinstance(x, list)])
                             else:
                                 #ok not a direct function, maybe a functin provided by value...
+                                # DBG : lmimoza
+                                if not hasattr(value, f):
+                                    print "DBG"*10, "object", value, type(value), 'is missing', f
                                 f = getattr(value, f)
                                 if callable(f):
                                     value = f()

-- 
UNNAMED PROJECT