From ca848e2a84f208aa35770a643298dd7bcddf19f0 Mon Sep 17 00:00:00 2001 From: Iustin Pop <iustin@google.com> Date: Sat, 2 Jul 2011 21:56:38 +0200 Subject: [PATCH] htools: small simplification to parseUtilisation We eliminate the local variable as it's used only once. Signed-off-by: Iustin Pop <iustin@google.com> Reviewed-by: Guido Trotter <ultrotter@google.com> --- htools/Ganeti/HTools/ExtLoader.hs | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/htools/Ganeti/HTools/ExtLoader.hs b/htools/Ganeti/HTools/ExtLoader.hs index 74f68381d..435d3686d 100644 --- a/htools/Ganeti/HTools/ExtLoader.hs +++ b/htools/Ganeti/HTools/ExtLoader.hs @@ -57,17 +57,17 @@ wrapIO = flip catch (return . Bad . show) parseUtilisation :: String -> Result (String, DynUtil) parseUtilisation line = - let columns = sepSplit ' ' line - in case columns of - [name, cpu, mem, dsk, net] -> do - rcpu <- tryRead name cpu - rmem <- tryRead name mem - rdsk <- tryRead name dsk - rnet <- tryRead name net - let du = DynUtil { cpuWeight = rcpu, memWeight = rmem - , dskWeight = rdsk, netWeight = rnet } - return (name, du) - _ -> Bad $ "Cannot parse line " ++ line + case sepSplit ' ' line of + [name, cpu, mem, dsk, net] -> + do + rcpu <- tryRead name cpu + rmem <- tryRead name mem + rdsk <- tryRead name dsk + rnet <- tryRead name net + let du = DynUtil { cpuWeight = rcpu, memWeight = rmem + , dskWeight = rdsk, netWeight = rnet } + return (name, du) + _ -> Bad $ "Cannot parse line " ++ line -- | External tool data loader from a variety of sources. loadExternalData :: Options -- GitLab