Working on rc.d friendliness...

[Rakka.git] / Main.hs

diff --git a/Main.hs b/Main.hs
index 02a4cf4702996013cfdcc6dc07c6646b1d707bb0..736033feda5be8aef8976d81cb397705bed33187 100644 (file)
--- a/Main.hs
+++ b/Main.hs
@@ -7,6 +7,7 @@ import           Network.HTTP.Lucu
 import           OpenSSL
 import           Rakka.Environment
 import           Rakka.Resource.CheckAuth
+import           Rakka.Resource.DumpRepos
 import           Rakka.Resource.Index
 import           Rakka.Resource.JavaScript
 import           Rakka.Resource.PageEntity
@@ -14,7 +15,8 @@ import           Rakka.Resource.Object
 import           Rakka.Resource.Render
 import           Rakka.Resource.Search
 import           Rakka.Resource.SystemConfig
-import           Rakka.Resource.TrackBack
+-- import           Rakka.Resource.TrackBack
+import           Rakka.Resource.Users
 import           Rakka.Storage
 import           Subversion
 import           System.Console.GetOpt
@@ -39,7 +41,7 @@ data CmdOpt
     | OptUserName  String
     | OptGroupName String
     | OptLogLevel  Priority
-    | OptDisableStderrLog
+    | OptVerbose
     | OptRebuildIndex
     | OptHelp
     deriving (Eq, Show)
@@ -83,13 +85,13 @@ options = [ Option ['p'] ["port"]
                    (ReqArg (OptLogLevel . read) "LEVEL")
                    ("The lowest log level to show. (default: " ++ show defaultLogLevel ++ ")")
 
-          , Option [] ["disable-stderr-log"]
-                   (NoArg OptDisableStderrLog)
-                   ("Disable logging to stderr.")
+          , Option ['v'] ["verbose"]
+                   (NoArg OptVerbose)
+                   "Enable logging to stderr."
 
-          , Option [] ["rebuild-index"]
+          , Option ['r'] ["rebuild-index"]
                    (NoArg OptRebuildIndex)
-                   ("Rebuild the index database.")
+                   "Rebuild the index database."
 
           , Option ['h'] ["help"]
                    (NoArg OptHelp)
@@ -109,7 +111,7 @@ main = withOpenSSL $
        withSubversion $
        do (opts, nonOpts, errors) <- return . getOpt Permute options =<< getArgs
 
-          when (not $ null errors)
+          unless (null errors)
                    $ do mapM_ putStr errors
                         exitWith $ ExitFailure 1
 
@@ -117,7 +119,7 @@ main = withOpenSSL $
                    $ do printUsage
                         exitWith ExitSuccess
 
-          when (not $ null nonOpts)
+          unless (null nonOpts)
                    $ do printUsage
                         exitWith $ ExitFailure 1
 
@@ -144,6 +146,7 @@ resTree :: Environment -> ResTree
 resTree env
     = mkResTree [ ([]              , resIndex        env)
                 , (["checkAuth"   ], resCheckAuth    env)
+                , (["dumpRepos"   ], resDumpRepos    env)
                 , (["js"          ], javaScript         )
                 , (["object"      ], resObject       env)
                 , (["render"      ], resRender       env)
@@ -151,7 +154,8 @@ resTree env
                 , (["search.html" ], resSearch       env)
                 , (["search.xml"  ], resSearch       env)
                 , (["systemConfig"], resSystemConfig env)
-                , (["trackback"   ], resTrackBack    env)
+                -- , (["trackback"   ], resTrackBack    env)
+               , (["users"       ], resUsers        env)
                 ]
 
 
@@ -209,16 +213,16 @@ getLocalStateDir opts
 
 setupLogger :: [CmdOpt] -> IO ()
 setupLogger opts
-    = do let disableStderrLog = find (== OptDisableStderrLog) opts /= Nothing
-             logHandlers      = if disableStderrLog then
-                                    []
-                                else
-                                    [verboseStreamHandler stderr DEBUG]
-             logLevel         = fromMaybe defaultLogLevel
-                                $ do OptLogLevel l <- find (\ x -> case x of
-                                                                     OptLogLevel _ -> True
-                                                                     _             -> False) opts
-                                     return l
+    = do let verbose     = find (== OptVerbose) opts /= Nothing
+             logHandlers = if verbose then
+                               [verboseStreamHandler stderr DEBUG]
+                           else
+                               [] -- FIXME: enable file log
+             logLevel    = fromMaybe defaultLogLevel
+                           $ do OptLogLevel l <- find (\ x -> case x of
+                                                                OptLogLevel _ -> True
+                                                                _             -> False) opts
+                                return l
 
          logHandlers' <- sequence logHandlers
          updateGlobalLogger rootLoggerName (setHandlers logHandlers' . setLevel logLevel)