From c8fbd2860d944ede3988b26ef73ce954e5264c4f Mon Sep 17 00:00:00 2001 From: Ahmed Charles Date: Mon, 19 Oct 2015 03:12:18 +0000 Subject: [PATCH] Use logger rather than print for these messages. --- evennia/comms/managers.py | 9 +++++---- evennia/server/amp.py | 5 +++-- evennia/server/initial_setup.py | 10 +++++----- evennia/utils/utils.py | 3 ++- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/evennia/comms/managers.py b/evennia/comms/managers.py index e64072da17..df546a1a26 100644 --- a/evennia/comms/managers.py +++ b/evennia/comms/managers.py @@ -8,7 +8,8 @@ from __future__ import print_function from django.db import models from django.db.models import Q 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__ _PlayerDB = None @@ -109,7 +110,7 @@ def to_object(inp, objtype='player'): return _PlayerDB.objects.get(user_username__iexact=obj) if typ == 'dbref': 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() elif objtype == 'object': if typ == 'player': @@ -118,14 +119,14 @@ def to_object(inp, objtype='player'): return _ObjectDB.objects.get(db_key__iexact=obj) if typ == 'dbref': 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() elif objtype == 'channel': if typ == 'string': return _ChannelDB.objects.get(db_key__iexact=obj) if typ == 'dbref': 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() # diff --git a/evennia/server/amp.py b/evennia/server/amp.py index 21ac1ad791..9b3665ff5a 100644 --- a/evennia/server/amp.py +++ b/evennia/server/amp.py @@ -30,6 +30,7 @@ except ImportError: from twisted.protocols import amp from twisted.internet import protocol, reactor from twisted.internet.defer import Deferred +from evennia.utils import logger from evennia.utils.utils import to_str, variable_from_module # communication bits @@ -377,8 +378,8 @@ class AMPProtocol(amp.AMP): """ e.trap(Exception) - print("AMP Error for %(info)s: %(e)s" % {'info': info, - 'e': e.getErrorMessage()}) + logger.log_err("AMP Error for %(info)s: %(e)s" % {'info': info, + 'e': e.getErrorMessage()}) def send_data(self, command, sessid, **kwargs): """ diff --git a/evennia/server/initial_setup.py b/evennia/server/initial_setup.py index 1f3cc04f4a..3a1029b727 100644 --- a/evennia/server/initial_setup.py +++ b/evennia/server/initial_setup.py @@ -12,7 +12,7 @@ from django.conf import settings from django.utils.translation import ugettext as _ from evennia.players.models import PlayerDB from evennia.server.models import ServerConfig -from evennia.utils import create +from evennia.utils import create, logger 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. # This object is pure django and only holds name, email and password. @@ -132,7 +132,7 @@ def create_channels(): Creates some sensible default channels. """ - print(" Creating default channels ...") + logger.log_info("Creating default channels ...") goduser = get_god_player() for channeldict in settings.DEFAULT_CHANNELS: @@ -155,7 +155,7 @@ def at_initial_setup(): mod = __import__(modname, fromlist=[None]) except (ImportError, ValueError): return - print(" Running at_initial_setup() hook.") + logger.log_info(" Running at_initial_setup() hook.") if mod.__dict__.get("at_initial_setup", None): mod.at_initial_setup() @@ -169,7 +169,7 @@ def reset_server(): """ 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') diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py index 66f543a424..40cbb85f05 100644 --- a/evennia/utils/utils.py +++ b/evennia/utils/utils.py @@ -23,6 +23,7 @@ from twisted.internet import threads, defer, reactor from django.conf import settings from django.utils import timezone from django.utils.translation import ugettext as _ +from evennia.utils import logger _MULTIMATCH_SEPARATOR = settings.SEARCH_MULTIMATCH_SEPARATOR @@ -870,7 +871,7 @@ def check_evennia_dependencies(): errstring = errstring.strip() if errstring: 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