Log RPC errors from inside executeRpcCall

executeRpcCall is the function to be used for executing RPCs, so it makes sense
to use it as the single point for logging all thte RPC call errors.

Fixes Issue 293.

Signed-off-by: Michele Tartara <mtartara@google.com>
Reviewed-by: Klaus Aehlig <aehlig@google.com>

diff --git a/src/Ganeti/Query/Node.hs b/src/Ganeti/Query/Node.hs
index f8a9d90..293ceb7 100644 (file)
--- a/src/Ganeti/Query/Node.hs
+++ b/src/Ganeti/Query/Node.hs
@@ -233,7 +233,6 @@ collectLiveData True cfg nodes = do
              Nothing -> (n : bn, gn, em)
       (bnodes, gnodes, emap) = foldr step ([], [], []) nodes
   rpcres <- executeRpcCall gnodes (RpcCallNodeInfo vgs hvs (Map.fromList emap))
-  logRpcErrors rpcres
   -- FIXME: The order of nodes in the result could be different from the input
   return $ zip bnodes (repeat $ Left (RpcResultError "Broken configuration"))
            ++ rpcres

diff --git a/src/Ganeti/Rpc.hs b/src/Ganeti/Rpc.hs
index 5c3c8bb..d3503e8 100644 (file)
--- a/src/Ganeti/Rpc.hs
+++ b/src/Ganeti/Rpc.hs
@@ -231,7 +231,9 @@ executeRpcCall nodes call = do
                 Ok r -> return r
   -- now parse the replies
   let results'' = map (parseHttpReply call) results'
-  return $ zip nodes results''
+      pairedList = zip nodes results''
+  logRpcErrors pairedList
+  return pairedList
 
 -- | Helper function that is used to read dictionaries of values.
 sanitizeDictResults :: [(String, J.Result a)] -> ERpcError [(String, a)]