diff options
author | Joey Hess <joey@kitenet.net> | 2013-01-15 13:34:59 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2013-01-15 13:34:59 -0400 |
commit | b236c46dbb20cfbb42201b7cccdaa153b7bd2ed1 (patch) | |
tree | 59915ff94b6cb0bb1df8858f30e06b5408af8b44 /Assistant/Threads | |
parent | fd9d5f0d9c3de99c53ba12c85e6c985baeb38901 (diff) |
webapp: Now always logs to .git/annex/daemon.log
It used to not log to daemon.log when a repository was first created, and
when starting the webapp. Now both do. Redirecting stdout and stderr to the
log is tricky when starting the webapp, because the web browser may want to
communicate with the user. (Either a console web browser, or web.browser = echo)
This is handled by restoring the original fds when running the browser.
Diffstat (limited to 'Assistant/Threads')
-rw-r--r-- | Assistant/Threads/Watcher.hs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 316f1fbaf..f2702ec35 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -97,6 +97,7 @@ startupScan scanner = do void $ liftIO $ cleanup liftAnnex $ showAction "started" + liftIO $ putStrLn "" modifyDaemonStatus_ $ \s -> s { scanComplete = True } |