Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Log tracebacks when exceptions occur and aren't handled 

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7208 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2009-04-27 19:03:18 +00:00 committed by Git SVN Gateway
parent 952fc1a708
commit b68ab0bb6d
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
tools/masterserver/wzmasterserver.py
View File

@ -44,6 +44,7 @@ import socket
from threading import Lock, Thread, Event, Timer
import select
import logging
import traceback
import cmd
from game import *
from protocol import *
@ -188,9 +189,12 @@ class RequestHandler(SocketServer.ThreadingMixIn, SocketServer.StreamRequestHand
gamedb.listGames()
except struct.error, e:
logging.warning("(%s) Data decoding error: %s" % (gameHost, e))
logging.warning("(%s) Data decoding error: %s" % (gameHost, traceback.format_exc()))
except KeyError, e:
logging.warning("(%s) Communication error: %s" % (gameHost, e))
logging.warning("(%s) Communication error: %s" % (gameHost, traceback.format_exc()))
except:
logging.error("(%s) Unhandled exception: %s" % (gameHost, traceback.format_exc()))
raise
finally:
if g:
gamedb.removeGame(g)
@ -199,14 +203,18 @@ class RequestHandler(SocketServer.ThreadingMixIn, SocketServer.StreamRequestHand
elif netCommand == 'list':
# Lock the gamelist to prevent new games while output.
with gamedblock:
gamesCount = len(gamedb.getGames())
logging.debug("(%s) Gameserver list: %i game(s)" % (gameHost, gamesCount))
try:
gamesCount = len(gamedb.getGames())
logging.debug("(%s) Gameserver list: %i game(s)" % (gameHost, gamesCount))
# Transmit the games.
for game in gamedb.getGames():
logging.debug(" %s" % game)
self.wfile.write(protocol.encodeMultiple(gamedb.getGames()))
break
# Transmit the games.
for game in gamedb.getGames():
logging.debug(" %s" % game)
self.wfile.write(protocol.encodeMultiple(gamedb.getGames()))
break
except:
logging.error("(%s) Unhandled exception: %s" % (gameHost, traceback.format_exc()))
raise
# If something unknown appears.
else: