b6d46c212e
* unannex, uninit: Avoid committing after every file is unannexed,
for massive speedup.
* --notify-finish switch will cause desktop notifications after each
file upload/download/drop completes
(using the dbus Desktop Notifications Specification)
* --notify-start switch will show desktop notifications when each
file upload/download starts.
* webapp: Automatically install Nautilus integration scripts
to get and drop files.
* tahoe: Pass -d parameter before subcommand; putting it after
the subcommand no longer works with tahoe-lafs version 1.10.
(Thanks, Alberto Berti)
* forget --drop-dead: Avoid removing the dead remote from the trust.log,
so that if git remotes for it still exist anywhere, git annex info
will still know it's dead and not show it.
* git-annex-shell: Make configlist automatically initialize
a remote git repository, as long as a git-annex branch has
been pushed to it, to simplify setup of remote git repositories,
including via gitolite.
* add --include-dotfiles: New option, perhaps useful for backups.
* Version 5.20140227 broke creation of glacier repositories,
not including the datacenter and vault in their configuration.
This bug is fixed, but glacier repositories set up with the broken
version of git-annex need to have the datacenter and vault set
in order to be usable. This can be done using git annex enableremote
to add the missing settings. For details, see
http://git-annex.branchable.com/bugs/problems_with_glacier/
* Added required content configuration.
* assistant: Improve ssh authorized keys line generated in local pairing
or for a remote ssh server to set environment variables in an
alternative way that works with the non-POSIX fish shell, as well
as POSIX shells.
# imported from the archive
110 lines
3.2 KiB
Haskell
110 lines
3.2 KiB
Haskell
{- git-annex assistant thread to detect when git-annex is upgraded
|
|
-
|
|
- Copyright 2013 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
{-# LANGUAGE CPP #-}
|
|
|
|
module Assistant.Threads.UpgradeWatcher (
|
|
upgradeWatcherThread
|
|
) where
|
|
|
|
import Assistant.Common
|
|
import Assistant.Upgrade
|
|
import Utility.DirWatcher
|
|
import Utility.DirWatcher.Types
|
|
import Utility.ThreadScheduler
|
|
import Assistant.Types.UrlRenderer
|
|
import Assistant.Alert
|
|
import Assistant.DaemonStatus
|
|
#ifdef WITH_WEBAPP
|
|
import Assistant.WebApp.Types
|
|
import qualified Build.SysConfig
|
|
#endif
|
|
|
|
import Control.Concurrent.MVar
|
|
import qualified Data.Text as T
|
|
|
|
data WatcherState = InStartupScan | Started | Upgrading
|
|
deriving (Eq)
|
|
|
|
upgradeWatcherThread :: UrlRenderer -> NamedThread
|
|
upgradeWatcherThread urlrenderer = namedThread "UpgradeWatcher" $ do
|
|
whenM (liftIO checkSuccessfulUpgrade) $
|
|
showSuccessfulUpgrade urlrenderer
|
|
go =<< liftIO upgradeFlagFile
|
|
where
|
|
go Nothing = debug [ "cannot determine program path" ]
|
|
go (Just flagfile) = do
|
|
mvar <- liftIO $ newMVar InStartupScan
|
|
changed <- Just <$> asIO2 (changedFile urlrenderer mvar flagfile)
|
|
let hooks = mkWatchHooks
|
|
{ addHook = changed
|
|
, delHook = changed
|
|
, addSymlinkHook = changed
|
|
, modifyHook = changed
|
|
, delDirHook = changed
|
|
}
|
|
let dir = parentDir flagfile
|
|
let depth = length (splitPath dir) + 1
|
|
let nosubdirs f = length (splitPath f) == depth
|
|
void $ liftIO $ watchDir dir nosubdirs False hooks (startup mvar)
|
|
-- Ignore bogus events generated during the startup scan.
|
|
-- We ask the watcher to not generate them, but just to be safe..
|
|
startup mvar scanner = do
|
|
r <- scanner
|
|
void $ swapMVar mvar Started
|
|
return r
|
|
|
|
changedFile :: UrlRenderer -> MVar WatcherState -> FilePath -> FilePath -> Maybe FileStatus -> Assistant ()
|
|
changedFile urlrenderer mvar flagfile file _status
|
|
| flagfile /= file = noop
|
|
| otherwise = do
|
|
state <- liftIO $ readMVar mvar
|
|
when (state == Started) $ do
|
|
setstate Upgrading
|
|
ifM (liftIO upgradeSanityCheck)
|
|
( handleUpgrade urlrenderer
|
|
, do
|
|
debug ["new version failed sanity check; not using"]
|
|
setstate Started
|
|
)
|
|
where
|
|
setstate = void . liftIO . swapMVar mvar
|
|
|
|
handleUpgrade :: UrlRenderer -> Assistant ()
|
|
handleUpgrade urlrenderer = do
|
|
-- Wait 2 minutes for any final upgrade changes to settle.
|
|
-- (For example, other associated files may be being put into
|
|
-- place.) Not needed when using a distribution bundle, because
|
|
-- in that case git-annex handles the upgrade in a non-racy way.
|
|
liftIO $ unlessM usingDistribution $
|
|
threadDelaySeconds (Seconds 120)
|
|
ifM autoUpgradeEnabled
|
|
( do
|
|
debug ["starting automatic upgrade"]
|
|
unattendedUpgrade
|
|
#ifdef WITH_WEBAPP
|
|
, do
|
|
button <- mkAlertButton True (T.pack "Finish Upgrade") urlrenderer ConfigFinishUpgradeR
|
|
void $ addAlert $ upgradeReadyAlert button
|
|
#else
|
|
, noop
|
|
#endif
|
|
)
|
|
|
|
showSuccessfulUpgrade :: UrlRenderer -> Assistant ()
|
|
showSuccessfulUpgrade urlrenderer = do
|
|
#ifdef WITH_WEBAPP
|
|
button <- ifM autoUpgradeEnabled
|
|
( pure Nothing
|
|
, Just <$> mkAlertButton True
|
|
(T.pack "Enable Automatic Upgrades")
|
|
urlrenderer ConfigEnableAutomaticUpgradeR
|
|
)
|
|
void $ addAlert $ upgradeFinishedAlert button Build.SysConfig.packageversion
|
|
#else
|
|
noop
|
|
#endif
|