Rooba
/
mitogen
mirror of https://github.com/mitogen-hq/mitogen.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Get rid of CorruptMessageError.

This commit is contained in:
David Wilson 2016-08-13 23:44:43 +01:00
parent 73c418ef4b
commit 8ba5fbf27f
1 changed files with 19 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
econtext/core.py
View File

@ -41,22 +41,6 @@ class Error(Exception):
Exception.__init__(self, fmt % args) Exception.__init__(self, fmt % args)
class ChannelError(Error):
"""Raised when a channel dies or has been closed."""
class StreamError(Error):
"""Raised when a stream cannot be established."""
class CorruptMessageError(StreamError):
"""Raised when a corrupt message is received on a stream."""
class TimeoutError(StreamError):
"""Raised when a timeout occurs on a stream."""
class CallError(Error): class CallError(Error):
"""Raised when .call() fails""" """Raised when .call() fails"""
def __init__(self, e): def __init__(self, e):
@ -69,6 +53,18 @@ class CallError(Error):
Error.__init__(self, 'call failed: %s: %s\n%s', name, e, stack) Error.__init__(self, 'call failed: %s: %s\n%s', name, e, stack)
class ChannelError(Error):
"""Raised when a channel dies or has been closed."""
class StreamError(Error):
"""Raised when a stream cannot be established."""
class TimeoutError(StreamError):
"""Raised when a timeout occurs on a stream."""
class Dead(object): class Dead(object):
def __eq__(self, other): def __eq__(self, other):
return type(other) is Dead return type(other) is Dead
@ -287,7 +283,7 @@ class Stream(BasicStream):
def on_receive(self): def on_receive(self):
"""Handle the next complete message on the stream. Raise """Handle the next complete message on the stream. Raise
CorruptMessageError or IOError on failure.""" StreamError or IOError on failure."""
IOLOG.debug('%r.on_receive()', self) IOLOG.debug('%r.on_receive()', self)
buf = os.read(self.read_side.fd, 4096) buf = os.read(self.read_side.fd, 4096)
@ -311,7 +307,7 @@ class Stream(BasicStream):
self._rhmac.update(self._input_buf[20:msg_len+24]) self._rhmac.update(self._input_buf[20:msg_len+24])
expected_mac = self._rhmac.digest() expected_mac = self._rhmac.digest()
if msg_mac != expected_mac: if msg_mac != expected_mac:
raise CorruptMessageError('bad MAC: %r != got %r; %r', raise StreamError('bad MAC: %r != got %r; %r',
msg_mac.encode('hex'), msg_mac.encode('hex'),
expected_mac.encode('hex'), expected_mac.encode('hex'),
self._input_buf[24:msg_len+24]) self._input_buf[24:msg_len+24])
@ -319,7 +315,7 @@ class Stream(BasicStream):
try: try:
handle, data = self.unpickle(self._input_buf[24:msg_len+24]) handle, data = self.unpickle(self._input_buf[24:msg_len+24])
except (TypeError, ValueError), ex: except (TypeError, ValueError), ex:
raise CorruptMessageError('invalid message: %s', ex) raise StreamError('invalid message: %s', ex)
self._input_buf = self._input_buf[msg_len+24:] self._input_buf = self._input_buf[msg_len+24:]
self._invoke(handle, data) self._invoke(handle, data)
@ -330,7 +326,7 @@ class Stream(BasicStream):
try: try:
persist, fn = self._context._handle_map[handle] persist, fn = self._context._handle_map[handle]
except KeyError: except KeyError:
raise CorruptMessageError('%r: invalid handle: %r', self, handle) raise StreamError('%r: invalid handle: %r', self, handle)
if not persist: if not persist:
del self._context._handle_map[handle] del self._context._handle_map[handle]