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
81 lines
2.8 KiB
Haskell
81 lines
2.8 KiB
Haskell
{- git-annex XMPP pusher threads
|
|
-
|
|
- This is a pair of threads. One handles git send-pack,
|
|
- and the other git receive-pack. Each thread can be running at most
|
|
- one such operation at a time.
|
|
-
|
|
- Why not use a single thread? Consider two clients A and B.
|
|
- If both decide to run a receive-pack at the same time to the other,
|
|
- they would deadlock with only one thread. For larger numbers of
|
|
- clients, the two threads are also sufficient.
|
|
-
|
|
- Copyright 2013 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Assistant.Threads.XMPPPusher where
|
|
|
|
import Assistant.Common
|
|
import Assistant.NetMessager
|
|
import Assistant.Types.NetMessager
|
|
import Assistant.WebApp (UrlRenderer)
|
|
import Assistant.WebApp.Configurators.XMPP (checkCloudRepos)
|
|
import Assistant.XMPP.Git
|
|
|
|
import Control.Exception as E
|
|
|
|
xmppSendPackThread :: UrlRenderer -> NamedThread
|
|
xmppSendPackThread = pusherThread "XMPPSendPack" SendPack
|
|
|
|
xmppReceivePackThread :: UrlRenderer -> NamedThread
|
|
xmppReceivePackThread = pusherThread "XMPPReceivePack" ReceivePack
|
|
|
|
pusherThread :: String -> PushSide -> UrlRenderer -> NamedThread
|
|
pusherThread threadname side urlrenderer = namedThread threadname $ go Nothing
|
|
where
|
|
go lastpushedto = do
|
|
msg <- waitPushInitiation side $ selectNextPush lastpushedto
|
|
debug ["started running push", logNetMessage msg]
|
|
|
|
runpush <- asIO $ runPush checker msg
|
|
r <- liftIO (E.try runpush :: IO (Either SomeException (Maybe ClientID)))
|
|
let successful = case r of
|
|
Right (Just _) -> True
|
|
_ -> False
|
|
|
|
{- Empty the inbox, because stuff may have
|
|
- been left in it if the push failed. -}
|
|
let justpushedto = getclient msg
|
|
maybe noop (`emptyInbox` side) justpushedto
|
|
|
|
debug ["finished running push", logNetMessage msg, show successful]
|
|
go $ if successful then justpushedto else lastpushedto
|
|
|
|
checker = checkCloudRepos urlrenderer
|
|
|
|
getclient (Pushing cid _) = Just cid
|
|
getclient _ = Nothing
|
|
|
|
{- Select the next push to run from the queue.
|
|
- The queue cannot be empty!
|
|
-
|
|
- We prefer to select the most recently added push, because its requestor
|
|
- is more likely to still be connected.
|
|
-
|
|
- When passed the ID of a client we just pushed to, we prefer to not
|
|
- immediately push again to that same client. This avoids one client
|
|
- drowing out others. So pushes from the client we just pushed to are
|
|
- relocated to the beginning of the list, to be processed later.
|
|
-}
|
|
selectNextPush :: Maybe ClientID -> [NetMessage] -> (NetMessage, [NetMessage])
|
|
selectNextPush _ (m:[]) = (m, []) -- common case
|
|
selectNextPush _ [] = error "selectNextPush: empty list"
|
|
selectNextPush lastpushedto l = go [] l
|
|
where
|
|
go (r:ejected) [] = (r, ejected)
|
|
go rejected (m:ms) = case m of
|
|
(Pushing clientid _)
|
|
| Just clientid /= lastpushedto -> (m, rejected ++ ms)
|
|
_ -> go (m:rejected) ms
|
|
go [] [] = undefined
|