[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, master, updated. 016db4e7560fc8ef5ccdb6357745ef691650d94a

[Frescha]

The following commit has been merged in the master branch:
commit 122aed47544eb12b107a5dfa970823e37f558f17
Author: Frescha <frescha at unitedseed.de>
Date:   Mon Nov 14 20:55:58 2011 +0100

    Fix Issue #75 (hopefully)

diff --git a/shinken/modules/merlindb_broker/merlindb_broker.py b/shinken/modules/merlindb_broker/merlindb_broker.py
index d79a0c1..70a8922 100644
--- a/shinken/modules/merlindb_broker/merlindb_broker.py
+++ b/shinken/modules/merlindb_broker/merlindb_broker.py
@@ -1,5 +1,10 @@
-#!/usr/bin/python
-#Copyright (C) 2009 Gabes Jean, naparuba at gmail.com
+#!/usr/bin/env python
+#Copyright (C) 2009-2011 :
+#    Gabes Jean, naparuba at gmail.com
+#    Gerhard Lausser, Gerhard.Lausser at consol.de
+#    Gregory Starck, g.starck at gmail.com
+#    Hartmut Goebel, h.goebel at goebel-consult.de
+#    Andreas Karfusehr, andreas at karfusehr.de
 #
 #This file is part of Shinken.
 #
@@ -17,13 +22,6 @@
 #along with Shinken.  If not, see <http://www.gnu.org/licenses/>.
 
 
-#This Class is a plugin for the Shinken Broker. It is in charge
-#to brok information into the merlin database. for the moment
-#only Mysql is supported. This code is __imported__ from Broker.
-#The managed_brok function is called by Broker for manage the broks. It calls
-#the manage_*_brok functions that create queries, and then run queries.
-
-
 import copy
 import time
 
@@ -123,7 +121,7 @@ class Merlindb_broker(BaseModule):
                 'last_notification' : {'transform' : None},
                 'current_notification_number' : {'transform' : None},
                 'current_notification_id' : {'transform' : None},
-                'check_flapping_recovery_notification' : {'transform' : None, 'name' : 'check_flapping_recovery_notifi'},
+                'check_flapping_recovery_notification' : {'transform' : None},
                 'scheduled_downtime_depth' : {'transform' : None},
                 'pending_flex_downtime' : {'transform' : None},
                 },
@@ -179,7 +177,7 @@ class Merlindb_broker(BaseModule):
                 'last_notification' : {'transform' : None},
                 'current_notification_number' : {'transform' : None},
                 'current_notification_id' : {'transform' : None},
-                'check_flapping_recovery_notification' : {'transform' : None , 'name' : 'check_flapping_recovery_notifi'},
+                'check_flapping_recovery_notification' : {'transform' : None},
                 'scheduled_downtime_depth' : {'transform' : None},
                 'pending_flex_downtime' : {'transform' : None},
                 },
@@ -264,7 +262,7 @@ class Merlindb_broker(BaseModule):
                 'last_notification' : {'transform' : None},
                 'current_notification_number' : {'transform' : None},
                 'current_notification_id' : {'transform' : None},
-                'check_flapping_recovery_notification' : {'transform' : None, 'name' : 'check_flapping_recovery_notifi'},
+                'check_flapping_recovery_notification' : {'transform' : None},
                 'scheduled_downtime_depth' : {'transform' : None},
                 'pending_flex_downtime' : {'transform' : None},
                 },
@@ -320,7 +318,7 @@ class Merlindb_broker(BaseModule):
                 'last_notification' : {'transform' : None},
                 'current_notification_number' : {'transform' : None},
                 'current_notification_id' : {'transform' : None},
-                'check_flapping_recovery_notification' : {'transform' : None , 'name' : 'check_flapping_recovery_notifi'},
+                'check_flapping_recovery_notification' : {'transform' : None},
                 'scheduled_downtime_depth' : {'transform' : None},
                 'pending_flex_downtime' : {'transform' : None},
                 },

-- 
UNNAMED PROJECT