X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fservice%2Fwatcher%2Fworker.py;h=888ecd6370c5922f4269e23c462975236b2a0948;hb=19ee63847f8eb032009e63634b90eb594f3c0408;hp=11bdfdcc5b6af58c6aab8e37701ffe3519b1e315;hpb=8be81dfad35b08c4de77168e885bb18253069771;p=pti%2Fo2.git

diff --git a/o2ims/service/watcher/worker.py b/o2ims/service/watcher/worker.py
index 11bdfdc..888ecd6 100644
--- a/o2ims/service/watcher/worker.py
+++ b/o2ims/service/watcher/worker.py
@@ -14,16 +14,16 @@
 
 import time
 import sched
-from o2ims.service.watcher.base import BaseWatcher
+from o2ims.service.watcher.base import WatcherTree
 
-import logging
-logger = logging.getLogger(__name__)
+from o2common.helper import o2logging
+logger = o2logging.get_logger(__name__)
 
 
 class PollWorker(object):
     def __init__(self, interval=10) -> None:
         super().__init__()
-        self.watchers = {}
+        self.watchers = []
         self.schedinstance = sched.scheduler(time.time, time.sleep)
         self.schedinterval = interval
         self._stopped = True
@@ -34,19 +34,19 @@ class PollWorker(object):
         else:
             raise Exception("Invalid interval:" + interval)
 
-    def add_watcher(self, watcher: BaseWatcher):
-        self.watchers[watcher.targetname()] = watcher
+    def add_watcher(self, watcher: WatcherTree):
+        self.watchers.append(watcher)
 
     def _repeat(self):
         logger.debug("_repeat started")
         if self._stopped:
             return
-        for w in self.watchers.keys():
+        for w in self.watchers:
             try:
-                logger.debug("about to probe:"+w)
-                self.watchers[w].probe()
+                # logger.debug("about to probe:"+w)
+                w.probe(None)
             except Exception as ex:
-                logger.warning("Worker:" + w + " raises exception:" + str(ex))
+                logger.warning("Worker raises exception:" + str(ex))
                 continue
         self.schedinstance.enter(self.schedinterval, 1, self._repeat)