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

Gerhard Lausser gerhard.lausser at consol.de
Tue Feb 28 22:12:38 UTC 2012


The following commit has been merged in the debian/master branch:
commit b739ffb6d59c1a96fc10ee8db33772ffb928928d
Author: Gerhard Lausser <gerhard.lausser at consol.de>
Date:   Sun Jan 8 21:46:31 2012 +0100

    FIX make Regenerator a new-style object, so we can inherit with super

diff --git a/shinken/misc/regenerator.py b/shinken/misc/regenerator.py
index 2494d71..62578b2 100644
--- a/shinken/misc/regenerator.py
+++ b/shinken/misc/regenerator.py
@@ -40,7 +40,7 @@ from shinken.util import safe_print
 
 # Class for a Regenerator. It will get broks, and "regenerate" real obejcts
 # from them :)
-class Regenerator:
+class Regenerator(object):
     def __init__(self):
 
         # Our Real datas
diff --git a/shinken/modules/livestatus_broker/hooker.py b/shinken/modules/livestatus_broker/hooker.py
index 844c0fc..65065a5 100644
--- a/shinken/modules/livestatus_broker/hooker.py
+++ b/shinken/modules/livestatus_broker/hooker.py
@@ -27,6 +27,7 @@ class Hooker:
     def make_hook(self, hook, prop, default, func, as_prop):
 
         def hook_get_prop(elt):
+            print "i return prop %s from %s %s is %s" % (prop, type(elt), elt, getattr(elt, prop, default))
             return getattr(elt, prop, default)
 
 

-- 
UNNAMED PROJECT



More information about the Pkg-nagios-changes mailing list