Re: [PATCH master 5/5] Add basic HTTP server functionalities to Mond

[Iustin Pop]

On Mon, Mar 11, 2013 at 02:10:05PM +0100, Michele Tartara wrote:
> Add a stub implementation of the Mond HTTP server to Mond using the Haskell
> snap-server library.
> 
> Signed-off-by: Michele Tartara <mtart...@google.com>
> ---
>  src/Ganeti/Monitoring/Server.hs | 44 
> +++++++++++++++++++++++++++++++++++++----
>  1 file changed, 40 insertions(+), 4 deletions(-)
> 
> diff --git a/src/Ganeti/Monitoring/Server.hs b/src/Ganeti/Monitoring/Server.hs
> index 2448d8b..841010f 100644
> --- a/src/Ganeti/Monitoring/Server.hs
> +++ b/src/Ganeti/Monitoring/Server.hs
> @@ -31,7 +31,13 @@ module Ganeti.Monitoring.Server
>    , prepMain
>    ) where
>  
> +import Snap.Core
> +import Snap.Http.Server
> +import Data.Text
> +import qualified Text.JSON as J
> +
>  import Ganeti.Daemon
> +import qualified Ganeti.Constants as C
>  
>  -- * Types and constants definitions
>  
> @@ -39,7 +45,22 @@ import Ganeti.Daemon
>  type CheckResult = ()
>  
>  -- | Type alias for prepMain results.
> -type PrepResult = ()
> +type PrepResult = Config Snap ()
> +
> +-- | Version of the latest supported http API.
> +latestAPIVersion :: Int
> +latestAPIVersion = 1
> +
> +-- * Configuration handling
> +
> +-- | The default configuration for the HTTP server.
> +defaultHttpConf :: Config Snap ()
> +defaultHttpConf =
> +  setAccessLog (ConfigFileLog C.daemonsExtraLogfilesGanetiMondAccess) .
> +  setCompression False .
> +  setErrorLog (ConfigFileLog C.daemonsExtraLogfilesGanetiMondError) $
> +  setVerbose False
> +  emptyConfig
>  
>  -- * Helper functions
>  
> @@ -49,9 +70,24 @@ checkMain _ = return $ Right ()
>  
>  -- | Prepare function for monitoring agent.
>  prepMain :: PrepFn CheckResult PrepResult
> -prepMain _ _ = return ()
> +prepMain opts _ = return $
> +  setPort (maybe C.defaultMondPort fromIntegral (optPort opts))
> +    defaultHttpConf

"return $" on the next line, please.

Rest LGTM.

iustin