diff -r 0eab727d4717 -r 7842d085acf4 gameServer/hedgewars-server.hs --- a/gameServer/hedgewars-server.hs Wed Feb 02 11:28:38 2011 +0300 +++ b/gameServer/hedgewars-server.hs Wed Feb 02 21:23:12 2011 +0300 @@ -3,22 +3,15 @@ module Main where import Network.Socket -import qualified Network import Network.BSD import Control.Concurrent.STM import Control.Concurrent.Chan -#if defined(NEW_EXCEPTIONS) -import qualified Control.OldException as Exception -#else import qualified Control.Exception as Exception -#endif import System.Log.Logger ----------------------------------- import Opts import CoreTypes -import OfficialServer.DBInteraction import ServerCore -import Utils #if !defined(mingw32_HOST_OS) @@ -26,10 +19,12 @@ #endif +setupLoggers :: IO () setupLoggers = updateGlobalLogger "Clients" (setLevel INFO) +main :: IO () main = withSocketsDo $ do #if !defined(mingw32_HOST_OS) installHandler sigPIPE Ignore Nothing; @@ -38,11 +33,11 @@ setupLoggers - stats <- atomically $ newTMVar (StatisticsInfo 0 0) + stats' <- atomically $ newTMVar (StatisticsInfo 0 0) dbQueriesChan <- newChan - coreChan <- newChan - serverInfo' <- getOpts $ newServerInfo stats coreChan dbQueriesChan - + coreChan' <- newChan + serverInfo' <- getOpts $ newServerInfo stats' coreChan' dbQueriesChan + #if defined(OFFICIAL_SERVER) dbHost' <- askFromConsole "DB host: " dbLogin' <- askFromConsole "login: "