Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add o2dms api endpoint
[pti/o2.git]
/
o2ims
/
service
/
watcher
/
worker.py
diff --git
a/o2ims/service/watcher/worker.py
b/o2ims/service/watcher/worker.py
index
11bdfdc
..
888ecd6
100644
(file)
--- a/
o2ims/service/watcher/worker.py
+++ b/
o2ims/service/watcher/worker.py
@@
-14,16
+14,16
@@
\r
import time
\r
import sched
\r
\r
import time
\r
import sched
\r
-from o2ims.service.watcher.base import
BaseWatcher
\r
+from o2ims.service.watcher.base import
WatcherTree
\r
\r
\r
-
import
logging
\r
-logger =
logging.getL
ogger(__name__)
\r
+
from o2common.helper import o2
logging
\r
+logger =
o2logging.get_l
ogger(__name__)
\r
\r
\r
class PollWorker(object):
\r
def __init__(self, interval=10) -> None:
\r
super().__init__()
\r
\r
\r
class PollWorker(object):
\r
def __init__(self, interval=10) -> None:
\r
super().__init__()
\r
- self.watchers =
{}
\r
+ self.watchers =
[]
\r
self.schedinstance = sched.scheduler(time.time, time.sleep)
\r
self.schedinterval = interval
\r
self._stopped = True
\r
self.schedinstance = sched.scheduler(time.time, time.sleep)
\r
self.schedinterval = interval
\r
self._stopped = True
\r
@@
-34,19
+34,19
@@
class PollWorker(object):
else:
\r
raise Exception("Invalid interval:" + interval)
\r
\r
else:
\r
raise Exception("Invalid interval:" + interval)
\r
\r
- def add_watcher(self, watcher:
BaseWatcher
):
\r
- self.watchers
[watcher.targetname()] = watcher
\r
+ def add_watcher(self, watcher:
WatcherTree
):
\r
+ self.watchers
.append(watcher)
\r
\r
def _repeat(self):
\r
logger.debug("_repeat started")
\r
if self._stopped:
\r
return
\r
\r
def _repeat(self):
\r
logger.debug("_repeat started")
\r
if self._stopped:
\r
return
\r
- for w in self.watchers
.keys()
:
\r
+ for w in self.watchers:
\r
try:
\r
try:
\r
- logger.debug("about to probe:"+w)
\r
-
self.watchers[w].probe(
)
\r
+
#
logger.debug("about to probe:"+w)
\r
+
w.probe(None
)
\r
except Exception as ex:
\r
except Exception as ex:
\r
- logger.warning("Worker
:" + w + "
raises exception:" + str(ex))
\r
+ logger.warning("Worker raises exception:" + str(ex))
\r
continue
\r
self.schedinstance.enter(self.schedinterval, 1, self._repeat)
\r
\r
continue
\r
self.schedinstance.enter(self.schedinterval, 1, self._repeat)
\r
\r