mirror of
https://github.com/Mikaela/Limnoria.git
synced 2025-01-11 12:42:34 +01:00
Removed some debugging stuff (clearing msg.prefix before sending it) and added logging to match asyncoreDrivers and twistedDrivers.
This commit is contained in:
parent
2b6f989cb1
commit
1cf1e022a2
@ -67,9 +67,6 @@ class SocketDriver(drivers.IrcDriver):
|
|||||||
while msgs[-1] is not None:
|
while msgs[-1] is not None:
|
||||||
msgs.append(self.irc.takeMsg())
|
msgs.append(self.irc.takeMsg())
|
||||||
del msgs[-1]
|
del msgs[-1]
|
||||||
for msg in msgs:
|
|
||||||
msg.prefix = ''
|
|
||||||
msg._str = None
|
|
||||||
self.outbuffer += ''.join(map(str, msgs))
|
self.outbuffer += ''.join(map(str, msgs))
|
||||||
if self.outbuffer:
|
if self.outbuffer:
|
||||||
sent = self.conn.send(self.outbuffer)
|
sent = self.conn.send(self.outbuffer)
|
||||||
@ -86,7 +83,10 @@ class SocketDriver(drivers.IrcDriver):
|
|||||||
lines = self.inbuffer.split('\n')
|
lines = self.inbuffer.split('\n')
|
||||||
self.inbuffer = lines.pop()
|
self.inbuffer = lines.pop()
|
||||||
for line in lines:
|
for line in lines:
|
||||||
|
started = time.time()
|
||||||
msg = ircmsgs.IrcMsg(line)
|
msg = ircmsgs.IrcMsg(line)
|
||||||
|
debug.msg('Time to parse IrcMsg: %s' % (time.time()-start),
|
||||||
|
'verbose')
|
||||||
self.irc.feedMsg(msg)
|
self.irc.feedMsg(msg)
|
||||||
except socket.timeout:
|
except socket.timeout:
|
||||||
pass
|
pass
|
||||||
@ -108,7 +108,10 @@ class SocketDriver(drivers.IrcDriver):
|
|||||||
self.irc.reset()
|
self.irc.reset()
|
||||||
self.conn.close()
|
self.conn.close()
|
||||||
self.connected = False
|
self.connected = False
|
||||||
schedule.addEvent(self.reconnect, time.time()+300)
|
when = time.time() + 60
|
||||||
|
whenS = time.strftime(conf.logTimestampFormat, time.localtime(when))
|
||||||
|
debug.msg('Scheduling reconnect at %s' % whenS, 'normal')
|
||||||
|
schedule.addEvent(self.reconnect, when)
|
||||||
|
|
||||||
|
|
||||||
Driver = SocketDriver
|
Driver = SocketDriver
|
||||||
|
Loading…
Reference in New Issue
Block a user