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

[Gerhard Lausser]

The following commit has been merged in the debian/master branch:
commit e3c5e8874b85a8792541c016e12f826d1939d7f1
Author: Gerhard Lausser <gerhard.lausser at consol.de>
Date:   Sat Jan 21 21:06:15 2012 +0100

    Fix the fallback-to-built-in-logstore-module-method

diff --git a/shinken/modules/livestatus_broker/livestatus_broker.py b/shinken/modules/livestatus_broker/livestatus_broker.py
index f3b2b89..9f847e3 100644
--- a/shinken/modules/livestatus_broker/livestatus_broker.py
+++ b/shinken/modules/livestatus_broker/livestatus_broker.py
@@ -90,7 +90,7 @@ class LiveStatus_broker(BaseModule, Daemon):
         }
 
     def add_compatibility_sqlite_module(self):
-        if len([m for m in self.modules_manager.instances if m.module_type.startswith('logstore_')]) == 0:
+        if len([m for m in self.modules_manager.instances if m.properties['type'].startswith('logstore_')]) == 0:
             #  this shinken-specific.cfg does not use the new submodules
             for k in self.compat_sqlite.keys():
                 if self.compat_sqlite[k] == None:
@@ -349,6 +349,7 @@ class LiveStatus_broker(BaseModule, Daemon):
             server.bind((self.host, self.port))
             server.listen(backlog)
             self.listeners.append(server)
+            print "listening on tcp port", self.port
         if self.socket:
             if os.path.exists(self.socket):
                 os.remove(self.socket)
@@ -358,6 +359,7 @@ class LiveStatus_broker(BaseModule, Daemon):
             sock.bind(self.socket)
             sock.listen(backlog)
             self.listeners.append(sock)
+            print "listening on unix socket", self.socket
         self.input = self.listeners[:]
         open_connections = {}
 
diff --git a/test/test_livestatus_db.py b/test/test_livestatus_db.py
index 6a10e59..25e4e3f 100755
--- a/test/test_livestatus_db.py
+++ b/test/test_livestatus_db.py
@@ -752,6 +752,7 @@ class TestConfigNoLogstore(TestConfig):
         #--- livestatus_broker.do_main
 
     def test_has_implicit_module(self):
+        self.assert_(self.livestatus_broker.modules_manager.instances[0].properties['type'] == 'logstore_sqlite')
         self.assert_(self.livestatus_broker.modules_manager.instances[0].__class__.__name__ == 'LiveStatusLogStoreSqlite')
 
 

-- 
UNNAMED PROJECT