diff options
author | Siddharth Ravikumar <sravik@bgsu.edu> | 2015-04-01 09:45:45 -0400 |
---|---|---|
committer | Siddharth Ravikumar <sravik@bgsu.edu> | 2015-04-01 09:45:45 -0400 |
commit | 277408c058283bf73fbe6355fc7db0f6dbcbc24b (patch) | |
tree | 8389d8fcf96f718639e384284cf43fd6d6da89cf /combox/events.py | |
parent | d3976cc51ad53a369f698d1141cf966ca414a904 (diff) |
refactored the way locks work in combox.siloComboxSilo.
modified: combox/cbox.py
modified: combox/events.py
modified: combox/silo.py
modified: tests/events_test.py
modified: tests/silo_test.py
Diffstat (limited to 'combox/events.py')
-rw-r--r-- | combox/events.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/combox/events.py b/combox/events.py index fa47ceb..3ef4386 100644 --- a/combox/events.py +++ b/combox/events.py @@ -20,6 +20,7 @@ import os import logging from os import path +from threading import Lock from watchdog.events import LoggingEventHandler @@ -37,7 +38,7 @@ class ComboxDirMonitor(LoggingEventHandler): """ - def __init__(self, config): + def __init__(self, config, dblock): """ config: a dictinary which contains combox configuration. """ @@ -48,7 +49,7 @@ class ComboxDirMonitor(LoggingEventHandler): datefmt='%Y-%m-%d %H:%M:%S') self.config = config - self.silo = ComboxSilo(self.config) + self.silo = ComboxSilo(self.config, dblock) self.housekeep() @@ -57,7 +58,7 @@ class ComboxDirMonitor(LoggingEventHandler): """ Re-reads the silo from disk. """ - self.silo = ComboxSilo(self.config) + self.silo.reload() def housekeep(self): @@ -186,7 +187,7 @@ class NodeDirMonitor(LoggingEventHandler): """ - def __init__(self, config): + def __init__(self, config, dblock): """ config: a dictinary which contains combox configuration. """ @@ -197,14 +198,14 @@ class NodeDirMonitor(LoggingEventHandler): datefmt='%Y-%m-%d %H:%M:%S') self.config = config - self.silo = ComboxSilo(self.config) + self.silo = ComboxSilo(self.config, dblock) def silo_update(self): """ Re-reads the silo from disk. """ - self.silo = ComboxSilo(self.config) + self.silo.reload() def shardp(self, path): |