From fd50eaddbaff11feb78e50ad4cc00f94f1060bae Mon Sep 17 00:00:00 2001 From: Griatch Date: Thu, 7 Apr 2016 23:29:12 +0200 Subject: [PATCH] Fixed an error in channel.msg. Made sure to return a deferred from tail_log_file as its documentation suggests it should. --- evennia/comms/comms.py | 2 +- evennia/utils/logger.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/evennia/comms/comms.py b/evennia/comms/comms.py index 001a662d9d..05094f1ea3 100644 --- a/evennia/comms/comms.py +++ b/evennia/comms/comms.py @@ -275,7 +275,7 @@ class DefaultChannel(with_metaclass(TypeclassBase, ChannelDB)): senders (Object or list, optional): Senders of message to send. """ - self.msg(message, senders=senders, header=header, persistent=False) + self.msg(message, senders=senders, header=header, keep_log=False) # hooks diff --git a/evennia/utils/logger.py b/evennia/utils/logger.py index 225ac00e36..48646b0566 100644 --- a/evennia/utils/logger.py +++ b/evennia/utils/logger.py @@ -259,7 +259,7 @@ def tail_log_file(filename, offset, nlines, callback=None): filehandle = _open_log_file(filename) if filehandle: if callback: - deferToThread(seek_file, filehandle, offset, nlines, callback).addErrback(errback) + return deferToThread(seek_file, filehandle, offset, nlines, callback).addErrback(errback) else: return seek_file(filehandle, offset, nlines, callback)