From 5a2ad9c577ea835ad5a5b0fbeea4b153d756de6b Mon Sep 17 00:00:00 2001 From: Siddharth Ravikumar Date: Mon, 7 Sep 2015 18:10:24 -0400 Subject: combox.events: fixed deadlock issue. --- combox/events.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/combox/events.py b/combox/events.py index 49a1c15..23d869f 100644 --- a/combox/events.py +++ b/combox/events.py @@ -386,14 +386,13 @@ class NodeDirMonitor(LoggingEventHandler): print "Okay, %s (%s) was actually modified." % (cb_filename, event.dest_path) self.silo.node_rem('file_deleted', cb_filename) - with self.lock: - self.silo.node_set('file_modified', file_cb_path) - num = self.silo.node_get('file_modified', file_cb_path) - if num == self.num_nodes: - decrypt_and_glue(file_cb_path, self.config) - # update db. - self.silo.update(file_cb_path) - self.silo.node_rem('file_modified', file_cb_path) + self.silo.node_set('file_modified', file_cb_path) + num = self.silo.node_get('file_modified', file_cb_path) + if num == self.num_nodes: + decrypt_and_glue(file_cb_path, self.config) + # update db. + self.silo.update(file_cb_path) + self.silo.node_rem('file_modified', file_cb_path) return -- cgit v1.2.3