diff -r 878e551f0b4a -r f7a610e2ef5f gameServer/CoreTypes.hs --- a/gameServer/CoreTypes.hs Thu May 12 23:29:31 2011 +0200 +++ b/gameServer/CoreTypes.hs Sun May 15 18:10:01 2011 +0400 @@ -128,14 +128,15 @@ dbLogin :: B.ByteString, dbPassword :: B.ByteString, bans :: [BanInfo], - restartPending :: Bool, + shutdownPending :: Bool, coreChan :: Chan CoreMessage, dbQueries :: Chan DBQuery, + serverSocket :: Maybe Socket, serverConfig :: Maybe Conf } -newServerInfo :: Chan CoreMessage -> Chan DBQuery -> Maybe Conf -> ServerInfo +newServerInfo :: Chan CoreMessage -> Chan DBQuery -> Maybe Socket -> Maybe Conf -> ServerInfo newServerInfo = ServerInfo True @@ -181,7 +182,6 @@ data ShutdownException = ShutdownException - | RestartException deriving (Show, Typeable) instance Exception ShutdownException