combox

split and encrypted files between online file storage providers
git clone git://git.ricketyspace.net/combox.git
Log | Files | Refs

commit 5a2ad9c577ea835ad5a5b0fbeea4b153d756de6b
parent 4c32ddbf3dbda730ef80cba433497ee2e695266d
Author: Siddharth Ravikumar <sravik@bgsu.edu>
Date:   Mon,  7 Sep 2015 18:10:24 -0400

combox.events: fixed deadlock issue.

Diffstat:
combox/events.py | 15+++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)

diff --git 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