assistant restart on upgrade
This commit is contained in:
parent
ad653e49cf
commit
b9cdb55e0c
9 changed files with 127 additions and 25 deletions
|
@ -10,15 +10,47 @@
|
|||
module Assistant.WebApp.Configurators.Upgrade where
|
||||
|
||||
import Assistant.WebApp.Common
|
||||
import qualified Annex
|
||||
import Types.Distribution
|
||||
import Assistant.WebApp.OtherRepos
|
||||
import Assistant.Threads.Watcher
|
||||
import Assistant.Alert
|
||||
import Assistant.DaemonStatus
|
||||
import Assistant.NamedThread
|
||||
import Utility.ThreadScheduler
|
||||
import Utility.HumanTime
|
||||
import Git
|
||||
|
||||
import Data.Time.Clock
|
||||
import Control.Concurrent
|
||||
|
||||
getConfigUpgradeR :: GitAnnexDistribution -> Handler Html
|
||||
getConfigUpgradeR d = page "Upgrade git-annex" (Just Configuration) $ do
|
||||
getConfigStartUpgradeR :: GitAnnexDistribution -> Handler Html
|
||||
getConfigStartUpgradeR d = page "Upgrade git-annex" (Just Configuration) $ do
|
||||
now <- liftIO getCurrentTime
|
||||
let upgradeage = Duration $ floor $
|
||||
now `diffUTCTime` distributionReleasedate d
|
||||
$(widgetFile "configurators/upgrade")
|
||||
$(widgetFile "configurators/upgrade/start")
|
||||
|
||||
{- Finish upgrade by starting the new assistant in the same repository this
|
||||
- one is running in, and redirecting to it.
|
||||
-
|
||||
- Before the new assistant can be started, have to remove our
|
||||
- gitAnnexUrlFile and our gitAnnexPidFile. Pausing the watcher is also
|
||||
- a good idea, to avoid fighting when two assistants are running in the
|
||||
- same repo.
|
||||
-}
|
||||
getConfigFinishUpgradeR :: Handler Html
|
||||
getConfigFinishUpgradeR = do
|
||||
liftAssistant $ void $ addAlert upgradingAlert
|
||||
liftIO . maybe noop (`throwTo` PauseWatcher) =<< liftAssistant (namedThreadId watchThread)
|
||||
liftIO . nukeFile =<< liftAnnex (fromRepo gitAnnexUrlFile)
|
||||
liftIO . nukeFile =<< liftAnnex (fromRepo gitAnnexPidFile)
|
||||
ret <- switchToAssistant =<< liftAnnex (repoLocation <$> Annex.gitRepo)
|
||||
void . liftIO . forkIO =<< liftAssistant (asIO reaper)
|
||||
return ret
|
||||
where
|
||||
-- Wait for the redirect to be served to the browser
|
||||
-- before terminating this process.
|
||||
reaper = do
|
||||
liftIO $ threadDelaySeconds (Seconds 120)
|
||||
liftIO $ exitSuccess
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue