debug the omf part. Test are still missing

[nepi.git] / src / nepi / resources / omf / omf_api.py

diff --git a/src/nepi/resources/omf/omf_api.py b/src/nepi/resources/omf/omf_api.py
index 1223ed4..04d7839 100644 (file)
--- a/src/nepi/resources/omf/omf_api.py
+++ b/src/nepi/resources/omf/omf_api.py
@@ -18,18 +18,18 @@
 """
 
 import datetime
-import logging
 import ssl
 import sys
 import time
 import hashlib
-import nepi
 import threading
 
+from nepi.util.logger import Logger
+
 from nepi.resources.omf.omf_client import OMFClient
 from nepi.resources.omf.messages_5_4 import MessageHandler
 
-class OMFAPI(object):
+class OMFAPI(Logger):
     """
     .. class:: Class Args :
       
@@ -64,6 +64,8 @@ class OMFAPI(object):
         :type xmpp_root: Str
 
         """
+        super(OMFAPI, self).__init__("OMFAPI")
+        
         date = datetime.datetime.now().strftime("%Y-%m-%dt%H.%M.%S")
         tz = -time.altzone if time.daylight != 0 else -time.timezone
         date += "%+06.2f" % (tz / 3600) # timezone difference is in seconds
@@ -75,9 +77,6 @@ class OMFAPI(object):
         self._hostnames = []
         self._xmpp_root = xmpp_root or "OMF_5.4"
 
-        self._logger = logging.getLogger("nepi.omf.omfApi    ")
-        self._logger.setLevel(nepi.LOGLEVEL)
-
         # OMF xmpp client
         self._client = None
         # message handler
@@ -114,7 +113,7 @@ class OMFAPI(object):
             self._message = MessageHandler(self._slice, self._user)
         else:
             msg = "Unable to connect to the XMPP server."
-            self._logger.error(msg)
+            self.error(msg)
             raise RuntimeError(msg)
 
     def _enroll_experiment(self):
@@ -286,7 +285,8 @@ class OMFAPI(object):
         
         # Wait the send queue to be empty before disconnect
         self._client.disconnect(wait=True)
-        self._logger.debug(" Disconnected from XMPP Server")
+        msg = " Disconnected from XMPP Server"
+        self.debug(msg)
 
 
 class OMFAPIFactory(object):
@@ -319,6 +319,7 @@ class OMFAPIFactory(object):
             key = cls._make_key(slice, host, port, password)
             cls.lock.acquire()
             if key in cls._apis:
+                #print "Api Counter : " + str(cls._apis[key]['cnt'])
                 cls._apis[key]['cnt'] += 1
                 cls.lock.release()
                 return cls._apis[key]['api']