Sophie

Sophie

distrib > Fedora > 13 > i386 > media > updates-src > by-pkgid > d35520b2430091192368650e5280c518 > files > 2

hedgewars-0.9.12-3.fc13.src.rpm

--- gameServer/OfficialServer/DBInteraction.hs.orig	2010-05-23 17:45:54.000000000 -0500
+++ gameServer/OfficialServer/DBInteraction.hs	2010-05-23 17:46:06.000000000 -0500
@@ -13,7 +13,7 @@
 import qualified Data.Map as Map
 import Monad
 import Maybe
-import System.Log.Logger
+-- import System.Log.Logger
 import Data.Time
 ------------------------
 import CoreTypes
--- gameServer/Actions.hs.orig	2010-05-23 17:38:47.000000000 -0500
+++ gameServer/Actions.hs	2010-05-23 17:48:22.000000000 -0500
@@ -5,7 +5,7 @@
 import Data.IntMap
 import qualified Data.IntSet as IntSet
 import qualified Data.Sequence as Seq
-import System.Log.Logger
+-- import System.Log.Logger
 import Monad
 import Data.Time
 import Maybe
@@ -133,7 +133,7 @@
 
 
 processAction (clID, serverInfo, clients, rooms) (ByeClient msg) = do
-	infoM "Clients" (show (clientUID client) ++ " quits: " ++ msg)
+-- 	infoM "Clients" (show (clientUID client) ++ " quits: " ++ msg)
 	(_, _, newClients, newRooms) <-
 			if roomID client /= 0 then
 				processAction  (clID, serverInfo, clients, rooms) $ RoomRemoveThisClient "quit"
@@ -354,14 +354,14 @@
 processAction (clID, serverInfo, clients, rooms) (ProcessAccountInfo info) =
 	case info of
 		HasAccount passwd isAdmin -> do
-			infoM "Clients" $ show clID ++ " has account"
+-- 			infoM "Clients" $ show clID ++ " has account"
 			writeChan (sendChan $ clients ! clID) ["ASKPASSWORD"]
 			return (clID, serverInfo, adjust (\cl -> cl{webPassword = passwd, isAdministrator = isAdmin}) clID clients, rooms)
 		Guest -> do
-			infoM "Clients" $ show clID ++ " is guest"
+-- 			infoM "Clients" $ show clID ++ " is guest"
 			processAction (clID, serverInfo, adjust (\cl -> cl{logonPassed = True}) clID clients, rooms) MoveToLobby
 		Admin -> do
-			infoM "Clients" $ show clID ++ " is admin"
+-- 			infoM "Clients" $ show clID ++ " is admin"
 			foldM processAction (clID, serverInfo, adjust (\cl -> cl{logonPassed = True, isAdministrator = True}) clID clients, rooms) [MoveToLobby, AnswerThisClient ["ADMIN_ACCESS"]]
 
 
@@ -402,7 +402,7 @@
 
 processAction (clID, serverInfo, clients, rooms) (AddClient client) = do
 	let updatedClients = insert (clientUID client) client clients
-	infoM "Clients" (show (clientUID client) ++ ": New client. Time: " ++ show (connectTime client))
+-- 	infoM "Clients" (show (clientUID client) ++ ": New client. Time: " ++ show (connectTime client))
 	writeChan (sendChan client) ["CONNECTED", "Hedgewars server http://www.hedgewars.org/"]
 
 	let newLogins = takeWhile (\(_ , time) -> (connectTime client) `diffUTCTime` time <= 11) $ lastLogins serverInfo
--- gameServer/hedgewars-server.hs.orig	2010-05-23 17:38:56.000000000 -0500
+++ gameServer/hedgewars-server.hs	2010-05-23 17:44:33.000000000 -0500
@@ -11,7 +11,7 @@
 #else
 import qualified Control.Exception as Exception
 #endif
-import System.Log.Logger
+-- import System.Log.Logger
 -----------------------------------
 import Opts
 import CoreTypes
@@ -25,9 +25,9 @@
 #endif
 
 
-setupLoggers =
-	updateGlobalLogger "Clients"
-		(setLevel INFO)
+-- setupLoggers =
+-- 	updateGlobalLogger "Clients"
+-- 		(setLevel INFO)
 
 main = withSocketsDo $ do
 #if !defined(mingw32_HOST_OS)
@@ -35,7 +35,7 @@
 	installHandler sigCHLD Ignore Nothing;
 #endif
 
-	setupLoggers
+--	setupLoggers
 
 	stats <- atomically $ newTMVar (StatisticsInfo 0 0)
 	dbQueriesChan <- newChan
--- gameServer/ServerCore.hs.orig	2010-05-23 17:39:06.000000000 -0500
+++ gameServer/ServerCore.hs	2010-05-23 17:49:23.000000000 -0500
@@ -6,7 +6,7 @@
 import Control.Concurrent.Chan
 import Control.Monad
 import qualified Data.IntMap as IntMap
-import System.Log.Logger
+-- import System.Log.Logger
 --------------------------------------
 import CoreTypes
 import NetRoutines
@@ -36,12 +36,12 @@
 					(clientUID ci, serverInfo, clients, rooms) (AddClient ci)
 
 			ClientMessage (clID, cmd) -> do
-				debugM "Clients" $ (show clID) ++ ": " ++ (show cmd)
+--				debugM "Clients" $ (show clID) ++ ": " ++ (show cmd)
 				if clID `IntMap.member` clients then
 					reactCmd serverInfo clID cmd clients rooms
 					else
 					do
-					debugM "Clients" "Message from dead client"
+-- 					debugM "Clients" "Message from dead client"
 					return (serverInfo, clients, rooms)
 
 			ClientAccountInfo (clID, info) ->
@@ -51,7 +51,7 @@
 						(ProcessAccountInfo info)
 					else
 					do
-					debugM "Clients" "Got info for dead client"
+-- 					debugM "Clients" "Got info for dead client"
 					return (serverInfo, clients, rooms)
 
 			TimerAction tick ->
@@ -84,4 +84,4 @@
 
 	forkIO $ mainLoop serverInfo IntMap.empty (IntMap.singleton 0 newRoom)
 
-	forever $ threadDelay (60 * 60 * 10^6) >> putStrLn "***"
\ No newline at end of file
+	forever $ threadDelay (60 * 60 * 10^6) >> putStrLn "***"