aboutsummaryrefslogtreecommitdiff
path: root/Assistant
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-02-13 15:51:13 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-02-13 15:54:28 -0400
commit88927d5de36310bd30f55773b16e0a4ce2306444 (patch)
tree417147020253435e79ce2ffc9ca8bcf992bb18e2 /Assistant
parentff67a0c19ab544ce00373679ad301438686101d6 (diff)
include problem PairData in error message
Users occasionally report this error firing, and I can't see why, so include the rejected PairData in the error message. This is safe even if it contains evil escape characters, because showing it displays them in escaped form. This commit was sponsored by Bruno BEAUFILS on Patreon.
Diffstat (limited to 'Assistant')
-rw-r--r--Assistant/Threads/PairListener.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Assistant/Threads/PairListener.hs b/Assistant/Threads/PairListener.hs
index 507575941..09eaf1fe8 100644
--- a/Assistant/Threads/PairListener.hs
+++ b/Assistant/Threads/PairListener.hs
@@ -49,8 +49,8 @@ pairListenerThread urlrenderer = namedThread "PairListener" $ do
debug ["ignoring message that looped back"]
go reqs cache sock
(_, _, False, _) -> do
- liftAnnex $ warning
- "illegal control characters in pairing message; ignoring"
+ liftAnnex $ warning $
+ "illegal control characters in pairing message; ignoring (" ++ show (pairMsgData m) ++ ")"
go reqs cache sock
-- PairReq starts a pairing process, so a
-- new one is always heeded, even if