diff --git a/htools/Ganeti/Confd/Server.hs b/htools/Ganeti/Confd/Server.hs index a05d3501b9a273f56a24fb9ac2ff036c5f775d65..4ca0014c71418a8754beb5cafa1bf996a59181db 100644 --- a/htools/Ganeti/Confd/Server.hs +++ b/htools/Ganeti/Confd/Server.hs @@ -43,7 +43,6 @@ import System.Exit import System.IO import System.Posix.Files import System.Posix.Types -import System.Time import qualified Text.JSON as J import System.INotify @@ -132,12 +131,6 @@ queryInternalError = (ReplyStatusError, J.showJSON ConfdErrorInternal) queryArgumentError :: StatusAnswer queryArgumentError = (ReplyStatusError, J.showJSON ConfdErrorArgument) --- | Returns the current time. -getCurrentTime :: IO Integer -getCurrentTime = do - TOD ctime _ <- getClockTime - return ctime - -- | Converter from specific error to a string format. gntErrorToResult :: ErrorResult a -> Result a gntErrorToResult (Bad err) = Bad (show err) diff --git a/htools/Ganeti/Confd/Utils.hs b/htools/Ganeti/Confd/Utils.hs index 71f4ef0069dd49bbd49c6f8cef620c966a8ae716..d0e60a3407791b1fc9f89307fcbd3f61c18fc5dd 100644 --- a/htools/Ganeti/Confd/Utils.hs +++ b/htools/Ganeti/Confd/Utils.hs @@ -31,10 +31,12 @@ module Ganeti.Confd.Utils , parseRequest , parseMessage , signMessage + , getCurrentTime ) where import qualified Data.ByteString as B import qualified Text.JSON as J +import System.Time import Ganeti.BasicTypes import Ganeti.Confd.Types @@ -80,3 +82,9 @@ signMessage key salt msg = , signedMsgHmac = hmac } where hmac = computeMac key (Just salt) msg + +-- | Returns the current time. +getCurrentTime :: IO Integer +getCurrentTime = do + TOD ctime _ <- getClockTime + return ctime