From 7623b1a8632da6c94ef46c8f6b9fa3a1031e9e81 Mon Sep 17 00:00:00 2001 From: Kelketek Date: Sat, 1 Jun 2013 07:22:46 -0500 Subject: [PATCH 1/2] Fixed #379. Addcom no longer crashes when used IC. --- src/commands/default/comms.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/commands/default/comms.py b/src/commands/default/comms.py index 45e3598a2..1d318566d 100644 --- a/src/commands/default/comms.py +++ b/src/commands/default/comms.py @@ -42,7 +42,7 @@ def find_channel(caller, channelname, silent=False, noaliases=False): return None return channels[0] -class CmdAddCom(MuxCommand): +class CmdAddCom(MuxPlayerCommand): """ addcom - subscribe to a channel with optional alias @@ -111,7 +111,7 @@ class CmdAddCom(MuxCommand): self.msg(string) -class CmdDelCom(MuxCommand): +class CmdDelCom(MuxPlayerCommand): """ delcom - unsubscribe from channel or remove channel alias From b98cbd941d9bba0d6f2ff4160a8bf0a643395450 Mon Sep 17 00:00:00 2001 From: Kelketek Date: Sat, 1 Jun 2013 08:03:03 -0500 Subject: [PATCH 2/2] Removed log cycling. --- game/runner.py | 26 +------------------------- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/game/runner.py b/game/runner.py index f7408c74c..383457cb9 100644 --- a/game/runner.py +++ b/game/runner.py @@ -106,29 +106,6 @@ def get_pid(pidfile): pid = f.read() return pid -def cycle_logfile(logfile): - """ - Move the old log files to .old - - """ - logfile_old = logfile + '.old' - if os.path.exists(logfile): - # Cycle the old logfiles to *.old - if os.path.exists(logfile_old): - # E.g. Windows don't support rename-replace - os.remove(logfile_old) - os.rename(logfile, logfile_old) - - logfile = settings.HTTP_LOG_FILE.strip() - logfile_old = logfile + '.old' - if os.path.exists(logfile): - # Cycle the old logfiles to *.old - if os.path.exists(logfile_old): - # E.g. Windows don't support rename-replace - os.remove(logfile_old) - os.rename(logfile, logfile_old) - - # Start program management SERVER = None @@ -268,7 +245,6 @@ def main(): del server_argv[2] print "\nStarting Evennia Server (output to stdout)." else: - cycle_logfile(SERVER_LOGFILE) print "\nStarting Evennia Server (output to server logfile)." if options.sprof: server_argv.extend(sprof_argv) @@ -290,7 +266,7 @@ def main(): set_restart_mode(PORTAL_RESTART, True) print "\nStarting Evennia Portal in non-Daemon mode (output to stdout)." else: - cycle_logfile(PORTAL_LOGFILE) + PORTAL_LOGFILE set_restart_mode(PORTAL_RESTART, False) print "\nStarting Evennia Portal in Daemon mode (output to portal logfile)." if options.pprof: