diff --git a/rtjp_eventlet/server.py b/rtjp_eventlet/server.py index bf5a99a..23e6108 100644 --- a/rtjp_eventlet/server.py +++ b/rtjp_eventlet/server.py @@ -1,10 +1,9 @@ -from __future__ import absolute_import import sys import eventlet #from eventlet import api, coros, event import logging -from . import core -from . import errors +import core +import errors #from .. import core #logging.basicConfig() @@ -153,19 +152,20 @@ def _send_frame(self, id, buffer, ev): ev.send_exception(Exception("Not Connected")) return try: - self._send_lock.acquire() - self._sock.sendall(buffer) - self.logger.debug('SENT %s: %s', self, repr(buffer)) - except Exception, e: - self.logger.exception('%s Error sending payload %s', self, repr(buffer)) try: - self._sock.shutdown() - self._sock.close() - except: - pass - ev.send_exception(*sys.exc_info()) - else: - ev.send(id) + self._send_lock.acquire() + self._sock.sendall(buffer) + self.logger.debug('SENT %s: %s', self, repr(buffer)) + except Exception, e: + self.logger.exception('%s Error sending payload %s', self, repr(buffer)) + try: + self._sock.shutdown() + self._sock.close() + except: + pass + ev.send_exception(*sys.exc_info()) + else: + ev.send(id) finally: self._send_lock.release()