From 50371b6abdb20ba784b6a38cf2829d7cf4391ab7 Mon Sep 17 00:00:00 2001 From: Griatch Date: Mon, 19 Oct 2015 23:32:00 +0200 Subject: [PATCH] Merged conflicts. --- evennia/commands/cmdhandler.py | 2 +- evennia/commands/cmdsethandler.py | 2 +- evennia/commands/default/system.py | 2 +- evennia/commands/default/unloggedin.py | 2 +- evennia/contrib/email_login.py | 2 +- evennia/contrib/menu_login.py | 2 +- evennia/help/manager.py | 2 +- evennia/locks/lockhandler.py | 2 +- evennia/objects/manager.py | 2 +- evennia/objects/models.py | 4 ++-- evennia/objects/objects.py | 14 +++++++------- evennia/players/players.py | 2 +- evennia/scripts/scripthandler.py | 2 +- evennia/scripts/scripts.py | 2 +- evennia/server/models.py | 2 +- evennia/server/portal/imc2.py | 12 ++++++------ evennia/server/portal/irc.py | 6 +++--- evennia/server/portal/rss.py | 4 ++-- evennia/server/serversession.py | 2 +- evennia/utils/create.py | 2 +- evennia/utils/dbserialize.py | 2 +- evennia/utils/idmapper/models.py | 4 ++-- evennia/utils/utils.py | 2 +- 23 files changed, 39 insertions(+), 39 deletions(-) diff --git a/evennia/commands/cmdhandler.py b/evennia/commands/cmdhandler.py index c66403de4a..7a3ed55c27 100644 --- a/evennia/commands/cmdhandler.py +++ b/evennia/commands/cmdhandler.py @@ -576,7 +576,7 @@ def cmdhandler(called_by, raw_string, _testing=False, callertype="session", sess except NoCmdSets: # Critical error. - logger.log_errmsg("No cmdsets found: %s" % caller) + logger.log_err("No cmdsets found: %s" % caller) error_to.msg(_ERROR_NOCMDSETS, _nomulti=True) except Exception: diff --git a/evennia/commands/cmdsethandler.py b/evennia/commands/cmdsethandler.py index b4ea3ad883..35f10c1f6f 100644 --- a/evennia/commands/cmdsethandler.py +++ b/evennia/commands/cmdsethandler.py @@ -183,7 +183,7 @@ def import_cmdset(path, cmdsetobj, emit_to_obj=None, no_logging=False): # returning an empty error cmdset errstring = errstring.strip() if not no_logging: - logger.log_errmsg(errstring) + logger.log_err(errstring) if emit_to_obj and not ServerConfig.objects.conf("server_starting_mode"): emit_to_obj.msg(errstring) err_cmdset = _ErrorCmdSet() diff --git a/evennia/commands/default/system.py b/evennia/commands/default/system.py index 331d294091..097fdb544a 100644 --- a/evennia/commands/default/system.py +++ b/evennia/commands/default/system.py @@ -116,7 +116,7 @@ class CmdShutdown(MuxCommand): announcement = "\nServer is being SHUT DOWN!\n" if self.args: announcement += "%s\n" % self.args - logger.log_infomsg('Server shutdown by %s.' % self.caller.name) + logger.log_info('Server shutdown by %s.' % self.caller.name) SESSIONS.announce_all(announcement) SESSIONS.server.shutdown(mode='shutdown') SESSIONS.portal_shutdown() diff --git a/evennia/commands/default/unloggedin.py b/evennia/commands/default/unloggedin.py index 22f61ae477..9821bcb5a6 100644 --- a/evennia/commands/default/unloggedin.py +++ b/evennia/commands/default/unloggedin.py @@ -479,7 +479,7 @@ def _create_player(session, playername, password, permissions, typeclass=None): pchannel = ChannelDB.objects.get_channel(settings.DEFAULT_CHANNELS[0]["key"]) if not pchannel.connect(new_player): string = "New player '%s' could not connect to public channel!" % new_player.key - logger.log_errmsg(string) + logger.log_err(string) return new_player diff --git a/evennia/contrib/email_login.py b/evennia/contrib/email_login.py index 6ec9b32951..3303fe9943 100644 --- a/evennia/contrib/email_login.py +++ b/evennia/contrib/email_login.py @@ -224,7 +224,7 @@ its and @/./+/-/_ only.") # this echoes the restrictions made by django's auth m pchannel = ChannelDB.objects.get_channel(pchanneldef[0]) if not pchannel.connect(new_player): string = "New player '%s' could not connect to public channel!" % new_player.key - logger.log_errmsg(string) + logger.log_err(string) if MULTISESSION_MODE < 2: # if we only allow one character, create one with the same name as Player diff --git a/evennia/contrib/menu_login.py b/evennia/contrib/menu_login.py index f3176fd41f..62eb59d435 100644 --- a/evennia/contrib/menu_login.py +++ b/evennia/contrib/menu_login.py @@ -235,7 +235,7 @@ class CmdPasswordCreate(Command): # We are in the middle between logged in and -not, so we have # to handle tracebacks ourselves at this point. If we don't, we # won't see any errors at all. - self.caller.msg("An error occurred. Please e-mail an admin if the problem persists." + self.caller.msg("An error occurred. Please e-mail an admin if the problem persists.") logger.log_errmsg(traceback.format_exc()) diff --git a/evennia/help/manager.py b/evennia/help/manager.py index 38eb8ba84a..7745eb9889 100644 --- a/evennia/help/manager.py +++ b/evennia/help/manager.py @@ -126,7 +126,7 @@ class HelpEntryManager(models.Manager): topic.help_category = default_category topic.save() string = "Help database moved to category %s" % default_category - logger.log_infomsg(string) + logger.log_info(string) def search_help(self, ostring, help_category=None): """ diff --git a/evennia/locks/lockhandler.py b/evennia/locks/lockhandler.py index 037ae38aa5..9bd591719f 100644 --- a/evennia/locks/lockhandler.py +++ b/evennia/locks/lockhandler.py @@ -143,7 +143,7 @@ def _cache_lockfuncs(): for tup in (tup for tup in inspect.getmembers(mod) if callable(tup[1])): _LOCKFUNCS[tup[0]] = tup[1] else: - logger.log_errmsg("Couldn't load %s from PERMISSION_FUNC_MODULES." % modulepath) + logger.log_err("Couldn't load %s from PERMISSION_FUNC_MODULES." % modulepath) # # pre-compiled regular expressions diff --git a/evennia/objects/manager.py b/evennia/objects/manager.py index 8504f3225d..4d77b7f237 100644 --- a/evennia/objects/manager.py +++ b/evennia/objects/manager.py @@ -207,7 +207,7 @@ class ObjectDBManager(TypedObjectManager): return [] except ValueError: from evennia.utils import logger - logger.log_errmsg("The property '%s' does not support search criteria of the type %s." % (property_name, type(property_value))) + logger.log_err("The property '%s' does not support search criteria of the type %s." % (property_name, type(property_value))) return [] @returns_typeclass_list diff --git a/evennia/objects/models.py b/evennia/objects/models.py index 8136145cdd..eec5c7154b 100644 --- a/evennia/objects/models.py +++ b/evennia/objects/models.py @@ -269,8 +269,8 @@ class ObjectDB(TypedObject): raise #RuntimeError(errmsg) except Exception as e: errmsg = "Error (%s): %s is not a valid location." % (str(e), location) - logger.log_errmsg(errmsg) - raise #Exception(errmsg) + logger.log_trace(errmsg) + raise def __location_del(self): "Cleanly delete the location reference" diff --git a/evennia/objects/objects.py b/evennia/objects/objects.py index 616319b5d0..e060b9e99e 100644 --- a/evennia/objects/objects.py +++ b/evennia/objects/objects.py @@ -17,7 +17,7 @@ from evennia.scripts.scripthandler import ScriptHandler from evennia.commands import cmdset, command from evennia.commands.cmdsethandler import CmdSetHandler from evennia.commands import cmdhandler -from evennia.utils.logger import log_trace, log_errmsg +from evennia.utils import logger from evennia.utils.utils import (variable_from_module, lazy_property, make_iter, to_str, to_unicode) @@ -432,13 +432,13 @@ class DefaultObject(ObjectDB): try: from_obj.at_msg_send(text=text, to_obj=self, **kwargs) except Exception: - log_trace() + logger.log_trace() try: if not self.at_msg_receive(text=text, **kwargs): # if at_msg_receive returns false, we abort message to this object return except Exception: - log_trace() + logger.log_trace() # session relay kwargs['_nomulti'] = kwargs.get('_nomulti', True) @@ -522,7 +522,7 @@ class DefaultObject(ObjectDB): "Simple log helper method" trc = traceback.format_exc() errstring = "%s%s" % (trc, string) - log_trace() + logger.log_trace() self.msg(errstring) errtxt = _("Couldn't perform move ('%s'). Contact an admin.") @@ -585,7 +585,7 @@ class DefaultObject(ObjectDB): self.location = destination except Exception: emit_to_obj.msg(errtxt % "location change") - log_trace() + logger.log_trace() return False if not quiet: @@ -642,7 +642,7 @@ class DefaultObject(ObjectDB): default_home = None except Exception: string = _("Could not find default home '(#%d)'.") - log_errmsg(string % default_home_id) + logger.log_err(string % default_home_id) default_home = None for obj in self.contents: @@ -658,7 +658,7 @@ class DefaultObject(ObjectDB): string += "now has a null location." obj.location = None obj.msg(_("Something went wrong! You are dumped into nowhere. Contact an admin.")) - log_errmsg(string % (obj.name, obj.dbid)) + logger.log_err(string % (obj.name, obj.dbid)) return if obj.has_player: diff --git a/evennia/players/players.py b/evennia/players/players.py index 961c0af23d..0d880f8bfe 100644 --- a/evennia/players/players.py +++ b/evennia/players/players.py @@ -673,7 +673,7 @@ class DefaultPlayer(PlayerDB): if _CONNECT_CHANNEL: _CONNECT_CHANNEL.tempmsg("[%s, %s]: %s" % (_CONNECT_CHANNEL.key, now, message)) else: - logger.log_infomsg("[%s]: %s" % (now, message)) + logger.log_info("[%s]: %s" % (now, message)) def at_post_login(self, sessid=None): """ diff --git a/evennia/scripts/scripthandler.py b/evennia/scripts/scripthandler.py index 305eefebf3..16c5fbb76c 100644 --- a/evennia/scripts/scripthandler.py +++ b/evennia/scripts/scripthandler.py @@ -74,7 +74,7 @@ class ScriptHandler(object): script = create.create_script(scriptclass, key=key, obj=self.obj, autostart=autostart) if not script: - logger.log_errmsg("Script %s could not be created and/or started." % scriptclass) + logger.log_err("Script %s could not be created and/or started." % scriptclass) return False return True diff --git a/evennia/scripts/scripts.py b/evennia/scripts/scripts.py index cf2d8971e9..c7ddc8c725 100644 --- a/evennia/scripts/scripts.py +++ b/evennia/scripts/scripts.py @@ -207,7 +207,7 @@ class DefaultScript(ScriptBase): self.db_obj.msg(estring) except Exception: pass - logger.log_errmsg(estring) + logger.log_err(estring) def _step_callback(self): """ diff --git a/evennia/server/models.py b/evennia/server/models.py index 76cffd0fb6..0f7f5f0968 100644 --- a/evennia/server/models.py +++ b/evennia/server/models.py @@ -88,7 +88,7 @@ class ServerConfig(WeakSharedMemoryModel): "Setter. Allows for self.value = value" if utils.has_parent('django.db.models.base.Model', value): # we have to protect against storing db objects. - logger.log_errmsg("ServerConfig cannot store db objects! (%s)" % value) + logger.log_err("ServerConfig cannot store db objects! (%s)" % value) return self.db_value = pickle.dumps(value) self.save() diff --git a/evennia/server/portal/imc2.py b/evennia/server/portal/imc2.py index 74b83eb314..ca075d0858 100644 --- a/evennia/server/portal/imc2.py +++ b/evennia/server/portal/imc2.py @@ -228,7 +228,7 @@ class IMC2Bot(telnet.StatefulTelnetProtocol, Session): # Only support Plain text passwords. # SERVER Sends: PW version= - logger.log_infomsg("IMC2: AUTH< %s" % line) + logger.log_info("IMC2: AUTH< %s" % line) line_split = line.split(' ') pw_present = line_split[0] == 'PW' @@ -236,21 +236,21 @@ class IMC2Bot(telnet.StatefulTelnetProtocol, Session): if "reject" in line_split: auth_message = _("IMC2 server rejected connection.") - logger.log_infomsg(auth_message) + logger.log_info(auth_message) return if pw_present: self.server_name = line_split[1] self.network_name = line_split[4] elif autosetup_present: - logger.log_infomsg(_("IMC2: Autosetup response found.")) + logger.log_info(_("IMC2: Autosetup response found.")) self.server_name = line_split[1] self.network_name = line_split[3] self.is_authenticated = True self.sequence = int(time()) # Log to stdout and notify over MUDInfo. - logger.log_infomsg('IMC2: Authenticated to %s' % self.factory.network) + logger.log_info('IMC2: Authenticated to %s' % self.factory.network) # Ask to see what other MUDs are connected. self._send_packet(pck.IMC2PacketKeepAliveRequest()) @@ -274,7 +274,7 @@ class IMC2Bot(telnet.StatefulTelnetProtocol, Session): self.uid = int(self.factory.uid) self.logged_in = True self.factory.sessionhandler.connect(self) - logger.log_infomsg("IMC2 bot connected to %s." % self.network) + logger.log_info("IMC2 bot connected to %s." % self.network) # Send authentication packet. The reply will be caught by lineReceived self._send_packet(pck.IMC2PacketAuthPlaintext()) @@ -461,7 +461,7 @@ class IMC2BotFactory(protocol.ReconnectingClientFactory): def start(self): "Connect session to sessionhandler" def errback(fail): - logger.log_errmsg(fail.value) + logger.log_err(fail.value) if self.port: service = internet.TCPClient(self.network, int(self.port), self) diff --git a/evennia/server/portal/irc.py b/evennia/server/portal/irc.py index e7a8e6845b..bd05db43f5 100644 --- a/evennia/server/portal/irc.py +++ b/evennia/server/portal/irc.py @@ -148,8 +148,8 @@ class IRCBot(irc.IRCClient, Session): self.uid = int(self.factory.uid) self.logged_in = True self.factory.sessionhandler.connect(self) - logger.log_infomsg("IRC bot '%s' connected to %s at %s:%s." % (self.nickname, self.channel, - self.network, self.port)) + logger.log_info("IRC bot '%s' connected to %s at %s:%s." % (self.nickname, self.channel, + self.network, self.port)) def disconnect(self, reason=None): """ @@ -276,7 +276,7 @@ class IRCBotFactory(protocol.ReconnectingClientFactory): connector (Connector): Represents the connection. """ - logger.log_infomsg("(re)connecting to %s" % self.channel) + logger.log_info("(re)connecting to %s" % self.channel) def clientConnectionFailed(self, connector, reason): """ diff --git a/evennia/server/portal/rss.py b/evennia/server/portal/rss.py index bda8f20356..061b305c0d 100644 --- a/evennia/server/portal/rss.py +++ b/evennia/server/portal/rss.py @@ -94,7 +94,7 @@ class RSSReader(Session): def _errback(self, fail): "Report error" - logger.log_errmsg("RSS feed error: %s" % fail.value) + logger.log_err("RSS feed error: %s" % fail.value) def update(self, init=False): """ @@ -139,7 +139,7 @@ class RSSBotFactory(object): Called by portalsessionhandler. Starts te bot. """ def errback(fail): - logger.log_errmsg(fail.value) + logger.log_err(fail.value) # set up session and connect it to sessionhandler self.bot.init_session("rssbot", self.url, self.sessionhandler) diff --git a/evennia/server/serversession.py b/evennia/server/serversession.py index cf91408d42..66f930e46b 100644 --- a/evennia/server/serversession.py +++ b/evennia/server/serversession.py @@ -305,7 +305,7 @@ class ServerSession(Session): cchan.msg("[%s]: %s" % (cchan.key, message)) except Exception: pass - logger.log_infomsg(message) + logger.log_info(message) def get_client_size(self): """ diff --git a/evennia/utils/create.py b/evennia/utils/create.py index fb2875d665..ff2a1dd3f3 100644 --- a/evennia/utils/create.py +++ b/evennia/utils/create.py @@ -245,7 +245,7 @@ def create_help_entry(key, entrytext, category="General", locks=None): return new_help except IntegrityError: string = "Could not add help entry: key '%s' already exists." % key - logger.log_errmsg(string) + logger.log_err(string) return None except Exception: logger.log_trace() diff --git a/evennia/utils/dbserialize.py b/evennia/utils/dbserialize.py index 0e6f6caf71..9f2081d566 100644 --- a/evennia/utils/dbserialize.py +++ b/evennia/utils/dbserialize.py @@ -113,7 +113,7 @@ class _SaverMutable(object): elif self._db_obj: self._db_obj.value = self else: - logger.log_errmsg("_SaverMutable %s has no root Attribute to save to." % self) + logger.log_err("_SaverMutable %s has no root Attribute to save to." % self) def _convert_mutables(self, data): "converts mutables to Saver* variants and assigns .parent property" diff --git a/evennia/utils/idmapper/models.py b/evennia/utils/idmapper/models.py index 1020893bee..66d0030aa7 100644 --- a/evennia/utils/idmapper/models.py +++ b/evennia/utils/idmapper/models.py @@ -524,8 +524,8 @@ def conditional_flush(max_rmem, force=False): if ((now - LAST_FLUSH) < AUTO_FLUSH_MIN_INTERVAL) and not force: # too soon after last flush. - logger.log_warnmsg("Warning: Idmapper flush called more than "\ - "once in %s min interval. Check memory usage." % (AUTO_FLUSH_MIN_INTERVAL/60.0)) + logger.log_warn("Warning: Idmapper flush called more than "\ + "once in %s min interval. Check memory usage." % (AUTO_FLUSH_MIN_INTERVAL/60.0)) return if os.name == "nt": diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py index 6bbecb06ea..47eb25d256 100644 --- a/evennia/utils/utils.py +++ b/evennia/utils/utils.py @@ -1176,7 +1176,7 @@ def init_new_player(player): Deprecated. """ from evennia.utils import logger - logger.log_depmsg("evennia.utils.utils.init_new_player is DEPRECATED and should not be used.") + logger.log_dep("evennia.utils.utils.init_new_player is DEPRECATED and should not be used.") def string_similarity(string1, string2):