Fixed an error in channel.msg. Made sure to return a deferred from tail_log_file as its documentation suggests it should.
This commit is contained in:
parent
4a58fcb9f1
commit
fd50eaddba
2 changed files with 2 additions and 2 deletions
|
|
@ -275,7 +275,7 @@ class DefaultChannel(with_metaclass(TypeclassBase, ChannelDB)):
|
||||||
senders (Object or list, optional): Senders of message to send.
|
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
|
# hooks
|
||||||
|
|
|
||||||
|
|
@ -259,7 +259,7 @@ def tail_log_file(filename, offset, nlines, callback=None):
|
||||||
filehandle = _open_log_file(filename)
|
filehandle = _open_log_file(filename)
|
||||||
if filehandle:
|
if filehandle:
|
||||||
if callback:
|
if callback:
|
||||||
deferToThread(seek_file, filehandle, offset, nlines, callback).addErrback(errback)
|
return deferToThread(seek_file, filehandle, offset, nlines, callback).addErrback(errback)
|
||||||
else:
|
else:
|
||||||
return seek_file(filehandle, offset, nlines, callback)
|
return seek_file(filehandle, offset, nlines, callback)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue