From d34ed7b98fd4f7030ea12974a00a38bff54abb37 Mon Sep 17 00:00:00 2001 From: Giorgos Korfiatis <gkorf@grnet.gr> Date: Wed, 6 May 2015 17:07:31 +0300 Subject: [PATCH] no callback in notifiers --- agkyra/agkyra/syncer/localfs_client.py | 2 +- agkyra/agkyra/syncer/pithos_client.py | 2 +- agkyra/agkyra/syncer/syncer.py | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/agkyra/agkyra/syncer/localfs_client.py b/agkyra/agkyra/syncer/localfs_client.py index b12fcdd..bd948c4 100644 --- a/agkyra/agkyra/syncer/localfs_client.py +++ b/agkyra/agkyra/syncer/localfs_client.py @@ -526,7 +526,7 @@ class LocalfsFileClient(FileClient): def prepare_target(self, target_state): return LocalfsTargetHandle(self.settings, target_state) - def notifier(self, callback=None): + def notifier(self): def handle_path(path): rel_path = os.path.relpath(path, start=self.ROOTPATH) objname = utils.to_standard_sep(rel_path) diff --git a/agkyra/agkyra/syncer/pithos_client.py b/agkyra/agkyra/syncer/pithos_client.py index 42bbf14..ac573ba 100644 --- a/agkyra/agkyra/syncer/pithos_client.py +++ b/agkyra/agkyra/syncer/pithos_client.py @@ -296,7 +296,7 @@ class PithosFileClient(FileClient): (last_modified, candidates)) return candidates - def notifier(self, callback=None): + def notifier(self): interval = self.settings.pithos_list_interval class PollPithosThread(utils.StoppableThread): def run_body(this): diff --git a/agkyra/agkyra/syncer/syncer.py b/agkyra/agkyra/syncer/syncer.py index efcedfc..fd4c9a2 100644 --- a/agkyra/agkyra/syncer/syncer.py +++ b/agkyra/agkyra/syncer/syncer.py @@ -68,8 +68,7 @@ class FileSyncer(object): for signature, client in self.clients.iteritems(): notifier = self.notifiers.get(signature) if not self.thread_is_active(notifier): - self.notifiers[signature] = \ - client.notifier(callback=self.probe_file) + self.notifiers[signature] = client.notifier() else: logger.info("Notifier %s already up" % signature) -- GitLab