Mikaela/Limnoria
1
0
Fork 0
mirror of https://github.com/Mikaela/Limnoria.git synced 2024-11-07 19:49:23 +01:00
Code Issues Projects Releases Wiki Activity

Remove randomly failing assertions (race condition with environnements cleaning?)

Browse Source
This commit is contained in:
Valentin Lorentz 2013-07-28 16:56:22 +02:00
parent 517ee1cde6
commit b4eb4bfd65
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/world.py
View File

@ -149,13 +149,10 @@ def upkeep():
except IOError: # Win98 sux0rs! except IOError: # Win98 sux0rs!
pass pass
if conf.daemonized: if conf.daemonized:
if sys.version_info[0] >= 3:
from io import TextIOWrapper as file
# If we're daemonized, sys.stdout has been replaced with a StringIO # If we're daemonized, sys.stdout has been replaced with a StringIO
# object, so let's see if anything's been printed, and if so, let's # object, so let's see if anything's been printed, and if so, let's
# log.warning it (things shouldn't be printed, and we're more likely # log.warning it (things shouldn't be printed, and we're more likely
# to get bug reports if we make it a warning). # to get bug reports if we make it a warning).
assert not type(sys.stdout) == file, 'Not a StringIO object!'
if not hasattr(sys.stdout, 'getvalue'): if not hasattr(sys.stdout, 'getvalue'):
# Stupid twisted sometimes replaces our stdout with theirs, because # Stupid twisted sometimes replaces our stdout with theirs, because
# "The Twisted Way Is The Right Way" (ha!). So we're stuck simply # "The Twisted Way Is The Right Way" (ha!). So we're stuck simply
@ -167,7 +164,6 @@ def upkeep():
log.warning('Printed to stdout after daemonization: %s', s) log.warning('Printed to stdout after daemonization: %s', s)
sys.stdout.seek(0) sys.stdout.seek(0)
sys.stdout.truncate() # Truncates to current offset. sys.stdout.truncate() # Truncates to current offset.
assert not type(sys.stderr) == file, 'Not a StringIO object!'
s = sys.stderr.getvalue() s = sys.stderr.getvalue()
if s: if s:
log.error('Printed to stderr after daemonization: %s', s) log.error('Printed to stderr after daemonization: %s', s)