Remove some 1.2 specific code

[ganeti-local] / hscan.hs

diff --git a/hscan.hs b/hscan.hs
index e9c2981..4ce9cc7 100644 (file)
--- a/hscan.hs
+++ b/hscan.hs
@@ -79,9 +79,11 @@ serializeNodes nl csf ktn =
                           t_mem = (truncate $ Node.t_mem node)::Int
                           t_dsk = (truncate $ Node.t_dsk node)::Int
                       in
-                        printf "%s|%d|%d|%d|%d|%d" name
+                        printf "%s|%d|%d|%d|%d|%d|%c" name
                                    t_mem (Node.n_mem node) (Node.f_mem node)
-                                   t_dsk (Node.f_dsk node))
+                                   t_dsk (Node.f_dsk node)
+                                   (if Node.offline node then 'Y' else 'N')
+                 )
                  nodes
     in unlines nlines
 
@@ -153,23 +155,23 @@ main = do
               hFlush stdout
               node_data <- getNodes name
               inst_data <- getInstances name
-              (if isLeft(node_data)
-               then putStrLn $ fromLeft node_data
-               else if isLeft(inst_data)
-                    then putStrLn $ fromLeft inst_data
-                    else do
-                      let ndata = fromRight node_data
-                          idata = fromRight inst_data
-                          (nl, il, csf, ktn, kti) =
-                              Cluster.loadData ndata idata
-                          (_, fix_nl) = Cluster.checkData nl il ktn kti
-                      putStrLn $ printCluster fix_nl il ktn kti
-                      when (optShowNodes opts) $ do
-                           putStr $ Cluster.printNodes ktn fix_nl
-                      let ndata = serializeNodes nl csf ktn
-                          idata = serializeInstances il csf ktn kti
-                          oname = odir </> name
-                      writeFile (oname <.> "nodes") ndata
-                      writeFile (oname <.> "instances") idata)
+              (case node_data of
+                 Bad err -> putStrLn err
+                 Ok ndata ->
+                     case inst_data of
+                       Bad err -> putStrLn err
+                       Ok idata ->
+                           do
+                             let  (nl, il, csf, ktn, kti) =
+                                      Cluster.loadData ndata idata
+                                  (_, fix_nl) = Cluster.checkData nl il ktn kti
+                             putStrLn $ printCluster fix_nl il ktn kti
+                             when (optShowNodes opts) $ do
+                                      putStr $ Cluster.printNodes ktn fix_nl
+                             let ndata = serializeNodes nl csf ktn
+                                 idata = serializeInstances il csf ktn kti
+                                 oname = odir </> name
+                             writeFile (oname <.> "nodes") ndata
+                             writeFile (oname <.> "instances") idata)
        ) clusters
   exitWith ExitSuccess