software: fix startup

It may happen that get_providers are called twice in single python
process. Let's prevent an error to be raised due to double instantiation
of IndicationManager which is a singleton.

1 files changed, 9 insertions, 3 deletions

diff --git a/src/software/lmi/software/cimom_entry.py b/src/software/lmi/software/cimom_entry.py
index 33ac7bf..ffac501 100644
--- a/src/software/lmi/software/cimom_entry.py
+++ b/src/software/lmi/software/cimom_entry.py
@@ -24,8 +24,10 @@
 Entry module for OpenLMI Software providers.
 """
 
+import logging
 from multiprocessing import Queue
 
+from lmi.base import singletonmixin
 from lmi.providers import cmpi_logging
 from lmi.providers import JobManager
 from lmi.providers.IndicationManager import IndicationManager
@@ -118,9 +120,13 @@ def get_providers(env):
 
     # Initialization of indication manager -- running in separate thread as
     # daemon. That means it does not have to be cleaned up.
-    im = IndicationManager.get_instance(
-            env, "Software", util.Configuration.get_instance().namespace,
-            queue=Queue())
+    try:
+        im = IndicationManager.get_instance(
+                env, "Software", util.Configuration.get_instance().namespace,
+                queue=Queue())
+    except singletonmixin.SingletonException:
+        logging.get_logger(__name__).warn(
+                'IndicationManager instantiated for second time')
     JobManager.register_filters("LMI_SoftwareInstallationJob", im)
     JobManager.register_filters("LMI_SoftwareVerificationJob", im)