diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-02-13 15:51:13 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-02-13 15:54:28 -0400 |
| commit | 88927d5de36310bd30f55773b16e0a4ce2306444 (patch) | |
| tree | 417147020253435e79ce2ffc9ca8bcf992bb18e2 | |
| parent | ff67a0c19ab544ce00373679ad301438686101d6 (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.
| -rw-r--r-- | Assistant/Threads/PairListener.hs | 4 | ||||
| -rw-r--r-- | doc/forum/_illegal_control_characters_in_pairing_message__59___ignoring/comment_7_625df33e70f2f959c574d918a706648d._comment | 13 |
2 files changed, 15 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 diff --git a/doc/forum/_illegal_control_characters_in_pairing_message__59___ignoring/comment_7_625df33e70f2f959c574d918a706648d._comment b/doc/forum/_illegal_control_characters_in_pairing_message__59___ignoring/comment_7_625df33e70f2f959c574d918a706648d._comment new file mode 100644 index 000000000..c84353436 --- /dev/null +++ b/doc/forum/_illegal_control_characters_in_pairing_message__59___ignoring/comment_7_625df33e70f2f959c574d918a706648d._comment @@ -0,0 +1,13 @@ +[[!comment format=mdwn + username="joey" + subject="""comment 7""" + date="2017-02-13T19:52:36Z" + content=""" +Seems we can rule out user/hostname/directory, which probably leaves +the ssh public key as the culprit, but I'm not sure. + +So, I changed the error message to display the problem data, +in [[!commit 5fd15677042b66be81936f081fe0a17f5960096f]]. Once you have a +git-annex version with that commit, if you see the problem, paste in the +error message and I should be able to get to the bottom of this. +"""]] |