summaryrefslogtreecommitdiff
path: root/Assistant.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-10-05 17:02:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-10-05 17:04:21 -0400
commit07ee748029c711c7779f4073a3b946190d9a000e (patch)
treec5bae7482dbac98960f1a4d04a2d51bff5f7fd31 /Assistant.hs
parent9206bdbdf5bbc71ff6dd2c00314902dda1e48c14 (diff)
assistant: Detect stale git lock files at startup time, and remove them.
Extends the index.lock handling to other git lock files. I surveyed all lock files used by git, and found more than I expected. All are handled the same in git; it leaves them open while doing the operation, possibly writing the new file content to the lock file, and then closes them when done. The gc.pid file is excluded because it won't affect the normal operation of the assistant, and waiting for a gc to finish on startup wouldn't be good. All threads except the webapp thread wait on the new startup sanity checker thread to complete, so they won't try to do things with git that fail due to stale lock files. The webapp thread mostly avoids doing that kind of thing itself. A few configurators might fail on lock files, but only if the user is explicitly trying to run them. The webapp needs to start immediately when the user has opened it, even if there are stale lock files. Arranging for the threads to wait on the startup sanity checker was a bit of a bear. Have to get all the NotificationHandles set up before the startup sanity checker runs, or they won't see its signal. Perhaps the NotificationBroadcaster is not the best interface to have used for this. Oh well, it works. This commit was sponsored by Michael Jakl
Diffstat (limited to 'Assistant.hs')
-rw-r--r--Assistant.hs3
1 files changed, 3 insertions, 0 deletions
diff --git a/Assistant.hs b/Assistant.hs
index c14f1e0df..ad4ed4833 100644
--- a/Assistant.hs
+++ b/Assistant.hs
@@ -136,6 +136,9 @@ startDaemon assistant foreground listenhost startbrowser = do
, assist $ configMonitorThread
, assist $ glacierThread
, watch $ watchThread
+ -- must come last so that all threads that wait
+ -- on it have already started waiting
+ , watch $ sanityCheckerStartupThread
]
liftIO waitForTermination