diff -r bd540ba66599 -r 4771fed9272e gameServer/OfficialServer/DBInteraction.hs --- a/gameServer/OfficialServer/DBInteraction.hs Sat Mar 05 22:39:26 2011 +0300 +++ b/gameServer/OfficialServer/DBInteraction.hs Sun Mar 06 21:54:37 2011 +0300 @@ -27,7 +27,7 @@ localAddressList :: [B.ByteString] localAddressList = ["127.0.0.1", "0:0:0:0:0:0:0:1", "0:0:0:0:0:ffff:7f00:1"] -fakeDbConnection :: forall b c. ServerInfo c -> IO b +fakeDbConnection :: forall b. ServerInfo -> IO b fakeDbConnection si = forever $ do q <- readChan $ dbQueries si case q of @@ -38,7 +38,7 @@ --dbConnectionLoop :: forall b. (ServerInfo c) -> IO b #if defined(OFFICIAL_SERVER) -flushRequests :: (ServerInfo c) -> IO () +flushRequests :: ServerInfo -> IO () flushRequests si = do e <- isEmptyChan $ dbQueries si unless e $ do @@ -89,10 +89,10 @@ maybeException (Just a) = return a maybeException Nothing = ioError (userError "Can't read") -pipeDbConnection :: forall a c b. +pipeDbConnection :: forall a b. (Num a, Ord a) => Map.Map ByteString (UTCTime, AccountInfo) - -> ServerInfo c + -> ServerInfo -> a -> IO b @@ -116,7 +116,7 @@ threadDelay (3000000) pipeDbConnection updatedCache si newErrNum -dbConnectionLoop :: forall c b. ServerInfo c -> IO b +dbConnectionLoop :: forall b. ServerInfo -> IO b dbConnectionLoop si = if (not . B.null $ dbHost si) then pipeDbConnection Map.empty si 0 @@ -126,6 +126,6 @@ dbConnectionLoop = fakeDbConnection #endif -startDBConnection :: (ServerInfo c) -> IO () +startDBConnection :: ServerInfo -> IO () startDBConnection serverInfo = forkIO (dbConnectionLoop serverInfo) >> return ()