Skip to content

Rpc update #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Rpc update #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c345c03
rpc: If the socket is closed by peer, endpoint stop the serve.
May 23, 2013
3bc9f9e
rpc: allow the dict to params of request message
Jun 4, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ryu/lib/rpc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def _create_msgid(self):

def create_request(self, method, params):
assert isinstance(method, str)
assert isinstance(params, list)
assert isinstance(params, (list, dict))
msgid = self._create_msgid()
return (self._packer.pack([MessageType.REQUEST, msgid, method,
params]), msgid)
Expand All @@ -75,7 +75,7 @@ def create_response(self, msgid, error=None, result=None):

def create_notification(self, method, params):
assert isinstance(method, str)
assert isinstance(params, list)
assert isinstance(params, (list, dict))
return self._packer.pack([MessageType.NOTIFY, method, params])

def get_and_dispatch_messages(self, data, disp_table):
Expand Down Expand Up @@ -127,6 +127,7 @@ def __init__(self, sock, encoder=None, disp_table=None):
self._notifications = deque()
self._responses = {}
self._incoming = 0 # number of incoming messages in our queues
self.closed_by_peer = False

def selectable(self):
rlist = [self._sock]
Expand Down Expand Up @@ -154,7 +155,7 @@ def block(self):
select.select(rlist, wlist, rlist + wlist)

def serve(self):
while True:
while not self.closed_by_peer:
self.block()
self.process()

Expand Down Expand Up @@ -194,6 +195,9 @@ def receive_messages(self, all=False):
except IOError:
packet = None
if not packet:
if packet is not None:
# socket closed by peer
self.closed_by_peer = True
break
self._encoder.get_and_dispatch_messages(packet, self._table)
return self._incoming > 0
Expand Down