diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-12-27 14:03:35 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-12-27 14:03:35 -0400 |
| commit | 3e10589da2d8ca51111fa566ef6c0a243b95e1c8 (patch) | |
| tree | f62669affa29697cc31b49c82d8a3035abf1c32a | |
| parent | d8a9cf28fbfa8d8720d2bfd03b0ebe510ad3c3e5 (diff) | |
better protocol error message, indicate if the command was able to be parsed or was misplaced
| -rw-r--r-- | Remote/External.hs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Remote/External.hs b/Remote/External.hs index 3dad99022..251f423a6 100644 --- a/Remote/External.hs +++ b/Remote/External.hs @@ -241,14 +241,15 @@ receiveMessage lck external handleresponse handlerequest handleasync = do s <- fromExternal lck external externalReceive $ liftIO . hGetLine liftIO $ protocolDebug external False s 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 - Just req -> maybe (protocolError s) id (handlerequest req) + Just req -> maybe (protocolError True s) id (handlerequest req) Nothing -> case parseMessage s :: Maybe AsyncMessage of - Just msg -> maybe (protocolError s) id (handleasync msg) - Nothing -> protocolError s + Just msg -> maybe (protocolError True s) id (handleasync msg) + Nothing -> protocolError False s 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 sendto line = debugM "external" $ unwords |