From 9abbb084a2187855e5c2ebf25fe516e386cda381 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Sun, 26 Aug 2012 18:22:15 +0200
Subject: [PATCH] Fix error reporting for bad Luxi arguments in QueryD
Currently, the query daemon would simply close the connection to the
client without issuing a response, if parsing the arguments failed;
the error was just logged.
Since this is very ugly from the client's point of view, we change it
so that the error is both logged and sent back to the
client. Furthermore, the execution block reporting is also cleaned up
a bit, to make the code more uniform.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Agata Murawska <agatamurawska@google.com>
---
htools/Ganeti/Queryd.hs | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/htools/Ganeti/Queryd.hs b/htools/Ganeti/Queryd.hs
index c7d417a7e..2e421e73a 100644
--- a/htools/Ganeti/Queryd.hs
+++ b/htools/Ganeti/Queryd.hs
@@ -139,9 +139,10 @@ handleClientMsg client creader args = do
call_result <- handleCallWrapper cfg args
(!status, !rval) <-
case call_result of
- Bad x -> do
- logWarning $ "Failed to execute request: " ++ x
- return (False, JSString $ J.toJSString x)
+ Bad err -> do
+ let errmsg = "Failed to execute request: " ++ err
+ logWarning errmsg
+ return (False, showJSON errmsg)
Ok result -> do
logDebug $ "Result " ++ show (pp_value result)
return (True, result)
@@ -159,8 +160,11 @@ handleClient client creader = do
return False
RecvOk payload ->
case validateCall payload >>= decodeCall of
- Bad err -> logWarning ("Failed to parse request: " ++ err) >>
- return False
+ Bad err -> do
+ let errmsg = "Failed to parse request: " ++ err
+ logWarning errmsg
+ sendMsg client $ buildResponse False (showJSON errmsg)
+ return False
Ok args -> handleClientMsg client creader args
-- | Main client loop: runs one loop of 'handleClient', and if that
--
GitLab