mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

debug on error serving peer

Browse source
This commit is contained in:
Joey Hess 2016-12-09 13:00:19 -04:00
parent 58f5d41cac
commit 3d759a0322
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
RemoteDaemon/Transport/Tor.hs
View file

@ -92,13 +92,16 @@ serveClient th u r q = bracket setup cleanup go
} }
v <- liftIO $ runNetProto conn $ serveAuth u v <- liftIO $ runNetProto conn $ serveAuth u
case v of case v of
Right (Just theiruuid) -> void $ Right (Just theiruuid) -> void $ do
runFullProto (Serving theiruuid) conn $ v' <- runFullProto (Serving theiruuid) conn $
serveAuthed u serveAuthed u
case v' of
Right () -> return ()
Left e -> liftIO $ debugM "remotedaemon" ("Tor connection error: " ++ e)
Right Nothing -> liftIO $ Right Nothing -> liftIO $
debugM "remotedaemon" "Tor connection failed to authenticate" debugM "remotedaemon" "Tor connection failed to authenticate"
Left e -> liftIO $ Left e -> liftIO $
debugM "remotedaemon" ("Error while serving Tor connection: " ++ e) debugM "remotedaemon" ("Tor connection error before authentication: " ++ e)
-- Merge the duplicated state back in. -- Merge the duplicated state back in.
liftAnnex th $ mergeState st' liftAnnex th $ mergeState st'
debugM "remotedaemon" "done with Tor connection" debugM "remotedaemon" "done with Tor connection"