Merged conflicts.

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:

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()

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()

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