1
=== modified file 'ibid/source/irc.py'
2
--- ibid/source/irc.py	2009-03-16 18:52:53 +0000
3
+++ ibid/source/irc.py	2009-04-18 21:57:47 +0000
4
@@ -10,7 +10,7 @@
5
10
from pkg_resources import resource_exists, resource_string
10
from pkg_resources import resource_exists, resource_string
6
11
11
7
12
import ibid
12
import ibid
9
13
from ibid.config import Option, IntOption, BoolOption
13
from ibid.config import Option, IntOption, BoolOption, FloatOption
10
14
from ibid.models import Credential
14
from ibid.models import Credential
11
15
from ibid.source import IbidSourceFactory
15
from ibid.source import IbidSourceFactory
12
16
from ibid.event import Event
16
from ibid.event import Event
13
@@ -18,6 +18,8 @@
14
18
class Ircbot(irc.IRCClient):
18
class Ircbot(irc.IRCClient):
15
19
19
16
20
    versionNum = resource_exists(__name__, '../.version') and resource_string(__name__, '../.version') or ''
20
    versionNum = resource_exists(__name__, '../.version') and resource_string(__name__, '../.version') or ''
17
21
    _ping_deferred = None
18
22
    _reconnect_deferred = None
19
21
23
20
22
    def connectionMade(self):
24
    def connectionMade(self):
21
23
        self.nickname = self.factory.nick.encode('utf-8')
25
        self.nickname = self.factory.nick.encode('utf-8')
22
@@ -26,12 +28,40 @@
23
26
        self.factory.send = self.send
28
        self.factory.send = self.send
24
27
        self.factory.proto = self
29
        self.factory.proto = self
25
28
        self.auth_callbacks = {}
30
        self.auth_callbacks = {}
26
31
        self._ping_deferred = reactor.callLater(self.factory.ping_interval, self._idle_ping)
27
29
        self.factory.log.info(u"Connected")
32
        self.factory.log.info(u"Connected")
28
30
33
29
31
    def connectionLost(self, reason):
34
    def connectionLost(self, reason):
30
32
        self.factory.log.info(u"Disconnected (%s)", reason)
35
        self.factory.log.info(u"Disconnected (%s)", reason)
31
33
        irc.IRCClient.connectionLost(self, reason)
36
        irc.IRCClient.connectionLost(self, reason)
32
34
37
33
38
    def _idle_ping(self):
34
39
        self.factory.log.log(logging.DEBUG - 5, u'Sending idle PING')
35
40
        self._ping_deferred = None
36
41
        self._reconnect_deferred = reactor.callLater(self.factory.pong_timeout, self._timeout_reconnect)
37
42
        self.sendLine('PING foo')
38
43
39
44
    def _timeout_reconnect(self):
40
45
        self.factory.log.info(u'Ping-Pong timeout. Reconnecting')
41
46
        self.factory.clientConnectionLost(self.factory, 'pingpong timeout')
42
47
43
48
    def irc_PONG(self, prefix, params):
44
49
        if params[-1] == 'foo' and self._reconnect_deferred is not None:
45
50
            self.factory.log.log(logging.DEBUG - 5, u'Received PONG')
46
51
            self._reconnect_deferred.cancel()
47
52
            self._reconnect_deferred = None
48
53
            self._ping_deferred = reactor.callLater(self.factory.ping_interval, self._idle_ping)
49
54
        
50
55
    def dataReceived(self, data):
51
56
        irc.IRCClient.dataReceived(self, data)
52
57
        if self._ping_deferred is not None:
53
58
            self._ping_deferred.reset(self.factory.ping_interval)
54
59
55
60
    def sendLine(self, line):
56
61
        irc.IRCClient.sendLine(self, line)
57
62
        if self._ping_deferred is not None:
58
63
            self._ping_deferred.reset(self.factory.ping_interval)
59
64
60
35
    def signedOn(self):
65
    def signedOn(self):
61
36
        if self.factory.modes:
66
        if self.factory.modes:
62
37
            self.mode(self.nickname, True, self.factory.modes.encode('utf-8'))
67
            self.mode(self.nickname, True, self.factory.modes.encode('utf-8'))
63
@@ -155,6 +185,8 @@
64
155
    nick = Option('nick', 'IRC nick', ibid.config['botname'])
185
    nick = Option('nick', 'IRC nick', ibid.config['botname'])
65
156
    modes = Option('modes', 'User modes to set')
186
    modes = Option('modes', 'User modes to set')
66
157
    channels = Option('channels', 'Channels to autojoin', [])
187
    channels = Option('channels', 'Channels to autojoin', [])
67
188
    ping_interval = FloatOption('ping_interval', 'Seconds of idle before sending a PING', 60)
68
189
    pong_timeout = FloatOption('pong_timeout', 'Seconds to wait for PONG', 300)
69
158
190
70
159
    def __init__(self, name):
191
    def __init__(self, name):
71
160
        IbidSourceFactory.__init__(self, name)
192
        IbidSourceFactory.__init__(self, name)
Reviewer	Date Requested	Status
Michael Gorven		Approve on 2009-04-20
Jonathan Hitchcock	2009-04-19	Approve on 2009-04-20
Review via email: mp+5698@code.launchpad.net