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

better protocol error message, indicate if the command was able to be parsed or was misplaced

Browse source
This commit is contained in:
Joey Hess 2013-12-27 14:03:35 -04:00
parent 82c2439162
commit 551573570f
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Remote/External.hs
View file

@ -241,14 +241,15 @@ receiveMessage lck external handleresponse handlerequest handleasync = do
s <- fromExternal lck external externalReceive $ liftIO . hGetLine s <- fromExternal lck external externalReceive $ liftIO . hGetLine
liftIO $ protocolDebug external False s liftIO $ protocolDebug external False s
case parseMessage s :: Maybe Response of case parseMessage s :: Maybe Response of
Just resp -> maybe (protocolError s) id (handleresponse resp) Just resp -> maybe (protocolError True s) id (handleresponse resp)
Nothing -> case parseMessage s :: Maybe RemoteRequest of Nothing -> case parseMessage s :: Maybe RemoteRequest of
Just req -> maybe (protocolError s) id (handlerequest req) Just req -> maybe (protocolError True s) id (handlerequest req)
Nothing -> case parseMessage s :: Maybe AsyncMessage of Nothing -> case parseMessage s :: Maybe AsyncMessage of
Just msg -> maybe (protocolError s) id (handleasync msg) Just msg -> maybe (protocolError True s) id (handleasync msg)
Nothing -> protocolError s Nothing -> protocolError False s
where where
protocolError s = error $ "external special remote protocol error, unexpectedly received \"" ++ s ++ "\"" protocolError parsed s = error $ "external special remote protocol error, unexpectedly received \"" ++ s ++ "\" " ++
if parsed then "(command not allowed at this time)" else "(unable to parse command)"
protocolDebug :: External -> Bool -> String -> IO () protocolDebug :: External -> Bool -> String -> IO ()
protocolDebug external sendto line = debugM "external" $ unwords protocolDebug external sendto line = debugM "external" $ unwords