summaryrefslogtreecommitdiff
path: root/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-10-29 09:55:40 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-10-29 09:55:40 -0400
commit710dfa7e3ec897d6f02930540b10bb303e3a9c91 (patch)
tree5f046ee72ac000008b1e4c7853d5c3a788ec802e /Assistant.hs
parent579f63b6b756ca51b8f9fe53c3e668500718d91f (diff)
convert Watcher thread to Assistant monad
This is a nice win; much less code runs in Annex, so other threads have more chances to run concurrently. I do notice that renaming a file has gone from 1 to 2 commits. I think this is due to the above improvement letting the committer run more frequently, so it commits the rm first.
Diffstat (limited to 'Assistant.hs')
-rw-r--r--Assistant.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Assistant.hs b/Assistant.hs
index 8a1be3130..07f022aa6 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -215,7 +215,7 @@ startAssistant assistant daemonize webappwaiter = withThreadState $ \st -> do
#ifdef WITH_XMPP
, assist $ pushNotifierThread st dstatus pushnotifier
#endif
- , watch $ watchThread st dstatus transferqueue changechan
+ , watch $ watchThread
]
liftIO waitForTermination