summaryrefslogtreecommitdiff
path: root/RemoteDaemon/Core.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-04-09 14:10:29 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-04-09 14:14:55 -0400
commit8de1359bbbb3a5bd8a4a5588bacef88eb234bb7b (patch)
tree1ae689b9883bef374a6328229c693b3e9e636eca /RemoteDaemon/Core.hs
parent8014dafedf59f7feaac4153af5e330ab84a9cf8b (diff)
make git-remote-daemon ssh transport robust
* Remote system might be available, and connection get lost. Should reconnect, but needs to avoid bad behavior (ie, constant reconnect attempts.) Use exponential backoff. * Detect if old system had a too old git-annex-shell, and show the user a nice message in the webapp. Required parsing error messages, so perhaps this code shoudl be removed once enough time has passed.. * Switch the protocol to using remote URI's, rather than remote names. Names change. Also avoids issues with serialization of names containing whitespace. This is nearly ready for merge into master now. I'd still like to make the ssh transport smarter about reusing ssh connection caching during git pull. This commit was sponsored by Jim Paris.
Diffstat (limited to 'RemoteDaemon/Core.hs')
-rw-r--r--RemoteDaemon/Core.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/RemoteDaemon/Core.hs b/RemoteDaemon/Core.hs
index 7d07c35b1..0c2937103 100644
--- a/RemoteDaemon/Core.hs
+++ b/RemoteDaemon/Core.hs
@@ -106,7 +106,7 @@ genRemoteMap h@(TransportHandle g _) ochan =
ichan <- newChan :: IO (Chan Consumed)
return $ Just
( r
- , (transport r (Git.repoDescribe r) h ichan ochan, ichan)
+ , (transport r (RemoteURI u) h ichan ochan, ichan)
)
_ -> return Nothing
_ -> return Nothing