opendev
/
gear
Code Issues Proposed changes

Merge "Add a send lock to the base Connection class"

This commit is contained in:
Jenkins 2017-10-09 15:40:40 +00:00 committed by Gerrit Code Review
parent ca4666f005 b24b4d2f6e
commit c4a5decdc6
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gear/__init__.py
View File

@ -142,6 +142,7 @@ class Connection(object):
self.input_buffer = b''
self.need_bytes = False
self.echo_lock = threading.Lock()
self.send_lock = threading.Lock()
self._init()
def _init(self):
@ -237,17 +238,18 @@ class Connection(object):
:arg bytes data The raw data to send
"""
while True:
try:
self.conn.send(data)
except ssl.SSLError as e:
if e.errno == ssl.SSL_ERROR_WANT_READ:
continue
elif e.errno == ssl.SSL_ERROR_WANT_WRITE:
continue
else:
raise
break
with self.send_lock:
sent = 0
while sent < len(data):
try:
sent += self.conn.send(data)
except ssl.SSLError as e:
if e.errno == ssl.SSL_ERROR_WANT_READ:
continue
elif e.errno == ssl.SSL_ERROR_WANT_WRITE:
continue
else:
raise
def sendPacket(self, packet):
"""Send a packet to the server.