Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use logger rather than print for these messages.

Browse source
This commit is contained in:
Ahmed Charles 2015-10-19 03:12:18 +00:00 • committed by Griatch
parent 3357712103
commit c8fbd2860d
4 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
evennia/comms/managers.py
View file

@ -8,7 +8,8 @@ from __future__ import print_function
from django.db import models from django.db import models
from django.db.models import Q from django.db.models import Q
from evennia.typeclasses.managers import (TypedObjectManager, TypeclassManager, from evennia.typeclasses.managers import (TypedObjectManager, TypeclassManager,
returns_typeclass_list, returns_typeclass) returns_typeclass_list, returns_typeclass)
from evennia.utils import logger
_GA = object.__getattribute__ _GA = object.__getattribute__
_PlayerDB = None _PlayerDB = None
@ -109,7 +110,7 @@ def to_object(inp, objtype='player'):
return _PlayerDB.objects.get(user_username__iexact=obj) return _PlayerDB.objects.get(user_username__iexact=obj)
if typ == 'dbref': if typ == 'dbref':
return _PlayerDB.objects.get(id=obj) return _PlayerDB.objects.get(id=obj)
print(objtype, inp, obj, typ, type(inp)) logger.log_err("%s %s %s %s %s", objtype, inp, obj, typ, type(inp))
raise CommError() raise CommError()
elif objtype == 'object': elif objtype == 'object':
if typ == 'player': if typ == 'player':
@ -118,14 +119,14 @@ def to_object(inp, objtype='player'):
return _ObjectDB.objects.get(db_key__iexact=obj) return _ObjectDB.objects.get(db_key__iexact=obj)
if typ == 'dbref': if typ == 'dbref':
return _ObjectDB.objects.get(id=obj) return _ObjectDB.objects.get(id=obj)
print(objtype, inp, obj, typ, type(inp)) logger.log_err("%s %s %s %s %s", objtype, inp, obj, typ, type(inp))
raise CommError() raise CommError()
elif objtype == 'channel': elif objtype == 'channel':
if typ == 'string': if typ == 'string':
return _ChannelDB.objects.get(db_key__iexact=obj) return _ChannelDB.objects.get(db_key__iexact=obj)
if typ == 'dbref': if typ == 'dbref':
return _ChannelDB.objects.get(id=obj) return _ChannelDB.objects.get(id=obj)
print(objtype, inp, obj, typ, type(inp)) logger.log_err("%s %s %s %s %s", objtype, inp, obj, typ, type(inp))
raise CommError() raise CommError()
# #

5
evennia/server/amp.py
View file

@ -30,6 +30,7 @@ except ImportError:
from twisted.protocols import amp from twisted.protocols import amp
from twisted.internet import protocol, reactor from twisted.internet import protocol, reactor
from twisted.internet.defer import Deferred from twisted.internet.defer import Deferred
from evennia.utils import logger
from evennia.utils.utils import to_str, variable_from_module from evennia.utils.utils import to_str, variable_from_module
# communication bits # communication bits
@ -377,8 +378,8 @@ class AMPProtocol(amp.AMP):
""" """
e.trap(Exception) e.trap(Exception)
print("AMP Error for %(info)s: %(e)s" % {'info': info, logger.log_err("AMP Error for %(info)s: %(e)s" % {'info': info,
'e': e.getErrorMessage()}) 'e': e.getErrorMessage()})
def send_data(self, command, sessid, **kwargs): def send_data(self, command, sessid, **kwargs):
""" """

10
evennia/server/initial_setup.py
View file

@ -12,7 +12,7 @@ from django.conf import settings
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from evennia.players.models import PlayerDB from evennia.players.models import PlayerDB
from evennia.server.models import ServerConfig from evennia.server.models import ServerConfig
from evennia.utils import create from evennia.utils import create, logger
ERROR_NO_SUPERUSER = \ ERROR_NO_SUPERUSER = \
@ -70,7 +70,7 @@ def create_objects():
""" """
print(" Creating objects (Player #1 and Limbo room) ...") logger.log_info("Creating objects (Player #1 and Limbo room) ...")
# Set the initial User's account object's username on the #1 object. # Set the initial User's account object's username on the #1 object.
# This object is pure django and only holds name, email and password. # This object is pure django and only holds name, email and password.
@ -132,7 +132,7 @@ def create_channels():
Creates some sensible default channels. Creates some sensible default channels.
""" """
print(" Creating default channels ...") logger.log_info("Creating default channels ...")
goduser = get_god_player() goduser = get_god_player()
for channeldict in settings.DEFAULT_CHANNELS: for channeldict in settings.DEFAULT_CHANNELS:
@ -155,7 +155,7 @@ def at_initial_setup():
mod = __import__(modname, fromlist=[None]) mod = __import__(modname, fromlist=[None])
except (ImportError, ValueError): except (ImportError, ValueError):
return return
print(" Running at_initial_setup() hook.") logger.log_info(" Running at_initial_setup() hook.")
if mod.__dict__.get("at_initial_setup", None): if mod.__dict__.get("at_initial_setup", None):
mod.at_initial_setup() mod.at_initial_setup()
@ -169,7 +169,7 @@ def reset_server():
""" """
from evennia.server.sessionhandler import SESSIONS from evennia.server.sessionhandler import SESSIONS
print(" Initial setup complete. Restarting Server once.") logger.log_info(" Initial setup complete. Restarting Server once.")
SESSIONS.server.shutdown(mode='reset') SESSIONS.server.shutdown(mode='reset')

3
evennia/utils/utils.py
View file

@ -23,6 +23,7 @@ from twisted.internet import threads, defer, reactor
from django.conf import settings from django.conf import settings
from django.utils import timezone from django.utils import timezone
from django.utils.translation import ugettext as _ from django.utils.translation import ugettext as _
from evennia.utils import logger
_MULTIMATCH_SEPARATOR = settings.SEARCH_MULTIMATCH_SEPARATOR _MULTIMATCH_SEPARATOR = settings.SEARCH_MULTIMATCH_SEPARATOR
@ -870,7 +871,7 @@ def check_evennia_dependencies():
errstring = errstring.strip() errstring = errstring.strip()
if errstring: if errstring:
mlen = max(len(line) for line in errstring.split("\n")) mlen = max(len(line) for line in errstring.split("\n"))
print("%s\n%s\n%s" % ("-"*mlen, errstring, '-'*mlen)) logger.log_err("%s\n%s\n%s" % ("-"*mlen, errstring, '-'*mlen))
return not_error return not_error