On Fri, Jan 3, 2014 at 9:42 AM, Jose A. Lopes <[email protected]> wrote: > Fix whitespace in several modules. > > Signed-off-by: Jose A. Lopes <[email protected]> > --- > src/Ganeti/HTools/CLI.hs | 2 +- > src/Ganeti/Luxi.hs | 2 +- > src/Ganeti/Query/Server.hs | 15 +++++++-------- > 3 files changed, 9 insertions(+), 10 deletions(-) > > diff --git a/src/Ganeti/HTools/CLI.hs b/src/Ganeti/HTools/CLI.hs > index 33b9937..c404316 100644 > --- a/src/Ganeti/HTools/CLI.hs > +++ b/src/Ganeti/HTools/CLI.hs > @@ -59,7 +59,7 @@ module Ganeti.HTools.CLI > , oFullEvacuation > , oGroup > , oIAllocSrc > - , oIgnoreDyn > + , oIgnoreDyn > , oIgnoreNonRedundant > , oInstMoves > , oJobDelay > diff --git a/src/Ganeti/Luxi.hs b/src/Ganeti/Luxi.hs > index 1fb2602..fcbd093 100644 > --- a/src/Ganeti/Luxi.hs > +++ b/src/Ganeti/Luxi.hs > @@ -116,7 +116,7 @@ $(genLuxiOp "LuxiOp" > ) > , (luxiReqQueryClusterInfo, []) > , (luxiReqQueryTags, > - [ pTagsObject > + [ pTagsObject > , simpleField "name" [t| String |] > ]) > , (luxiReqSubmitJob, > diff --git a/src/Ganeti/Query/Server.hs b/src/Ganeti/Query/Server.hs > index 1e32e41..99bad39 100644 > --- a/src/Ganeti/Query/Server.hs > +++ b/src/Ganeti/Query/Server.hs > @@ -81,7 +81,7 @@ handleClassicQuery cfg qkind names fields _ = do > return $ showJSON <$> (qr >>= queryCompat) > > -- | Minimal wrapper to handle the missing config case. > -handleCallWrapper :: MVar () -> JQStatus -> Result ConfigData > +handleCallWrapper :: MVar () -> JQStatus -> Result ConfigData > -> LuxiOp -> IO (ErrorResult JSValue) > handleCallWrapper _ _ (Bad msg) _ = > return . Bad . ConfigurationError $ > @@ -90,7 +90,7 @@ handleCallWrapper _ _ (Bad msg) _ = > handleCallWrapper qlock qstat (Ok config) op = handleCall qlock qstat config > op > > -- | Actual luxi operation handler. > -handleCall :: MVar () -> JQStatus > +handleCall :: MVar () -> JQStatus > -> ConfigData -> LuxiOp -> IO (ErrorResult JSValue) > handleCall _ _ cdata QueryClusterInfo = > let cluster = configCluster cdata > @@ -209,7 +209,7 @@ handleCall _ _ cfg (QueryConfigValues fields) = do > QCluster.isWatcherPaused) > , ("master_node", return . genericResult (const JSNull) > showJSON > $ QCluster.clusterMasterNodeName cfg) > - , ("drain_flag", liftM showJSON isQueueOpen) > + , ("drain_flag", liftM showJSON isQueueOpen) > ] :: [(String, IO JSValue)] > let answer = map (fromMaybe (return JSNull) . flip lookup params) fields > answerEval <- sequence answer > @@ -271,7 +271,7 @@ handleCall qlock qstat cfg (SubmitManyJobs lops) = > $ annotated_results > > handleCall _ _ cfg (WaitForJobChange jid fields prev_job prev_log tmout) = do > - let compute_fn = computeJobUpdate cfg jid fields prev_log > + let compute_fn = computeJobUpdate cfg jid fields prev_log > qDir <- queueDir > -- verify if the job is finalized, and return immediately in this case > jobresult <- loadJobFromDisk qDir False jid > @@ -299,7 +299,7 @@ handleCall _ _ _ op = > > -- | Query the status of a job and return the requested fields > -- and the logs newer than the given log number. > -computeJobUpdate :: ConfigData -> JobId -> [String] -> JSValue > +computeJobUpdate :: ConfigData -> JobId -> [String] -> JSValue > -> IO (JSValue, JSValue) > computeJobUpdate cfg jid fields prev_log = do > let sjid = show $ fromJobId jid > @@ -338,7 +338,6 @@ luxiHandler cfg = U.Handler { U.hParse = > decodeLuxiCall > , U.hExec = luxiExec cfg > } > > - > -- | Type alias for prepMain results > type PrepResult = (Server, IORef (Result ConfigData), JQStatus) > > @@ -354,7 +353,7 @@ prepMain _ _ = do > s <- describeError "binding to the Luxi socket" > Nothing (Just socket_path) $ getLuxiServer True socket_path > cref <- newIORef (Bad "Configuration not yet loaded") > - jq <- emptyJQStatus > + jq <- emptyJQStatus > return (s, cref, jq) > > -- | Main function. > @@ -363,7 +362,7 @@ main _ _ (server, cref, jq) = do > initConfigReader id cref > let creader = readIORef cref > initJQScheduler jq > - > + > qlockFile <- jobQueueLockFile > lockFile qlockFile >>= exitIfBad "Failed to obtain the job-queue lock" > qlock <- newMVar () > -- > 1.8.5.1 >
LGTM, thanks. Michele -- Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
