diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-11-22 18:46:45 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-11-22 18:46:45 -0400 |
| commit | 0b83c3d4a173ebd4b5438f34b2fee490a2e97a72 (patch) | |
| tree | ce28febbce87c2923fb8ddb4b394c4b3dd324d3a /Assistant.hs | |
| parent | e2d2abaed5c2c5d146f1079c4a8d12fa891a1c63 (diff) | |
watch git-annex program file to detect upgrades
Not yet wired up to restart the assistant on upgrade; that needs careful
sanity checking to wait until the upgrade is done before restarting.
Used the DirWatcher here, so it gets events for any changes to the
directory containing the program file. (But not subdirs.) This is necessary
in order to detect when the file is renamed as part of the upgrade, which
an inotify on a single file would not detect. (Also, I have DirWatcher code,
but not FileWatcher code.)
Note that upgrades that remove or rename a whole directory tree containing
the executable will *not* trigger this code. So eg, deleting and replacing
the whole standalone tarball dir tree won't work -- but untarring it
over top will. So should dpkg package upgrades.
Added programPath, using a new GHC feature to find the full path to the
executable. The fallback code for old GHC or unsupported OS is less good;
its worst failure mode would be either failing to find the program, and so
not checking for upgrades, or finding a git-annex that's in PATH, but is
not the one running.
This commit was sponsored by John Roepke.
Diffstat (limited to 'Assistant.hs')
| -rw-r--r-- | Assistant.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Assistant.hs b/Assistant.hs index fd8e18843..f6540045e 100644 --- a/Assistant.hs +++ b/Assistant.hs @@ -29,6 +29,7 @@ import Assistant.Threads.MountWatcher #endif import Assistant.Threads.NetWatcher import Assistant.Threads.Upgrader +import Assistant.Threads.UpgradeWatcher import Assistant.Threads.TransferScanner import Assistant.Threads.TransferPoller import Assistant.Threads.ConfigMonitor @@ -152,6 +153,7 @@ startDaemon assistant foreground startdelay cannotrun listenhost startbrowser = #endif , assist $ netWatcherThread , assist $ upgraderThread urlrenderer + , assist $ upgradWatcherThread , assist $ netWatcherFallbackThread , assist $ transferScannerThread urlrenderer , assist $ cronnerThread urlrenderer |