From da65c5c1d1ec3f75bb4b32f861024ad3bfb2e503 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 5 Nov 2012 16:00:55 -0400
Subject: [PATCH] tweak

---
 Assistant/Threads/XMPPClient.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Assistant/Threads/XMPPClient.hs b/Assistant/Threads/XMPPClient.hs
index 0836fa0f65..1b3f2bdefd 100644
--- a/Assistant/Threads/XMPPClient.hs
+++ b/Assistant/Threads/XMPPClient.hs
@@ -50,24 +50,24 @@ xmppClientThread urlrenderer = NamedThread "XMPPClient" $ do
 		v <- liftAnnex getXMPPCreds
 		case v of
 			Nothing -> noop
-			Just c -> liftIO $ loop c =<< getCurrentTime
+			Just c -> liftIO $ retry (runclient c) =<< getCurrentTime
 	  where
 		debug' = void . liftIO . iodebug
 
 		{- When the client exits, it's restarted;
  		 - if it keeps failing, back off to wait 5 minutes before
  		 - trying it again. -}
-		loop c starttime = do
-			e <- runclient c
+		retry a starttime = do
+			e <- a
 			now <- getCurrentTime
 			if diffUTCTime now starttime > 300
 				then do
 					void $ iodebug ["connection lost; reconnecting", show e]
-					loop c now
+					retry a now
 				else do
 					void $ iodebug ["connection failed; will retry", show e]
 					threadDelaySeconds (Seconds 300)
-					loop c =<< getCurrentTime
+					retry a =<< getCurrentTime
 
 		runclient c = void $ connectXMPP c $ \jid -> do
 			selfjid <- bindJID jid