From 44a8ac8161755fabfdadd5f2620a13ac9c7674e3 Mon Sep 17 00:00:00 2001 From: Jean-Paul Calderone Date: Mon, 25 Feb 2019 15:51:25 -0500 Subject: [PATCH] convert start_monitoring --- src/allmydata/frontends/magic_folder.py | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index c3caf7859..b1f0f516b 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -625,6 +625,13 @@ COUNT_CHANGED = MessageType( u"The value of a counter has changed.", ) +START_MONITORING = ActionType( + u"magic-folder:start-monitoring", + [_NICKNAME, _DIRECTION], + [], + u"Uploader is beginning to monitor the filesystem for uploadable changes.", +) + class QueueMixin(HookMixin): """ @@ -925,12 +932,17 @@ class Uploader(QueueMixin): recursive=False)#True) def start_monitoring(self): - self._log("start_monitoring") - d = defer.succeed(None) + action = START_MONITORING( + nickname=self._client.nickname, + direction=self._name, + ) + with action.context(): + d = DeferredContext(defer.succeed(None)) + d.addCallback(lambda ign: self._notifier.startReading()) d.addCallback(lambda ign: self._count('dirs_monitored')) d.addBoth(self._call_hook, 'started') - return d + return d.addActionFinish() def stop(self): self._notifier.stopReading()