Ibid

Merge lp:~stefanor/ibid/manhole-disconnect into lp:~ibid-core/ibid/old-trunk-pack-0.92

  1. manhole-disconnect
  2. Merge into old-trunk-pack-0.92
Proposed by Stefano Rivera
Status: Merged
Approved by: Stefano Rivera
Approved revision: 675
Merged at revision: 679
Proposed branch: lp:~stefanor/ibid/manhole-disconnect
Merge into: lp:~ibid-core/ibid/old-trunk-pack-0.92
Diff against target: None lines
To merge this branch: bzr merge lp:~stefanor/ibid/manhole-disconnect
Reviewer Review Type Date Requested Status
Michael Gorven Approve
Jonathan Hitchcock Approve
Review via email: mp+7973@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Jonathan Hitchcock (vhata) :
review: Approve
Revision history for this message
Michael Gorven (mgorven) wrote :

 review approve

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ibid/source/manhole.py'
2--- ibid/source/manhole.py 2009-05-31 08:10:44 +0000
3+++ ibid/source/manhole.py 2009-06-27 22:55:51 +0000
4@@ -18,11 +18,16 @@
5
6 def setServiceParent(self, service=None):
7 if service:
8- return internet.TCPServer(self.port, ShellFactory()).setServiceParent(service)
9+ self.listener = internet.TCPServer(self.port, self).setServiceParent(service)
10+ return self.listener
11 else:
12- reactor.listenTCP(self.port, self)
13+ self.listener = reactor.listenTCP(self.port, self)
14
15 def connect(self):
16 return self.setServiceParent(None)
17
18+ def disconnect(self):
19+ self.listener.stopListening()
20+ return True
21+
22 # vi: set et sta sw=4 ts=4:
23
24=== modified file 'ibid/source/telnet.py'
25--- ibid/source/telnet.py 2009-06-20 22:50:43 +0000
26+++ ibid/source/telnet.py 2009-06-27 22:56:41 +0000
27@@ -7,6 +7,7 @@
28 import ibid
29 from ibid.source import IbidSourceFactory
30 from ibid.event import Event
31+from ibid.config import IntOption
32
33 class TelnetProtocol(telnet.StatefulTelnetProtocol):
34
35@@ -45,7 +46,7 @@
36 class SourceFactory(protocol.ServerFactory, IbidSourceFactory):
37 protocol = TelnetProtocol
38
39- port = 3000
40+ port = IntOption('port', 'Port number to listen on', 3000)
41
42 def __init__(self, name, *args, **kwargs):
43 #protocol.ServerFactory.__init__(self, *args, **kwargs)

Subscribers

People subscribed via source and target branches