Skip to content

Convert _send_json to async #10

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

Draft
kdienes wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Convert _send_json to async #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 9 additions & 5 deletions entanglement/protocol/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,21 +183,25 @@ async def _run_sync(self):
try:
while True:
elt = self.current_dirty.pop()
try:self._send_sync_message(elt)
try:
await self._send_sync_message(elt)
except:
logger.exception("Error sending {}".format(repr(elt.obj)))
if self.waiter: await self.waiter
except StopIteration: #empty set
self.task = None
self._send_sync_message(None) #Send metadata only message if useful
await self._send_sync_message(None) #Send metadata only message if useful
if self.drain_future:
self.drain_future.set_result(True)
self.drain_future = None
self.current_dirty = self.dirty
if len(self.dirty) > 0:
self.task = self.loop.create_task(self._run_sync())
except:
logger.exception(f'error in _run_sync')
raise

def _send_sync_message(self, elt):
async def _send_sync_message(self, elt):
flags = 0
responses_to = None
if elt and elt.response_for:
Expand All @@ -217,7 +221,7 @@ def _send_sync_message(self, elt):
sync_rep = {}
new_flags = self._handle_meta_out(flags, sync_rep)
if len(sync_rep) == 0: return
self._send_json(sync_rep, new_flags)
await self._send_json(sync_rep, new_flags)
self._out_counter += 1


Expand Down Expand Up @@ -326,7 +330,7 @@ def __init__(self, manager, incoming = False, dest = None, **kwargs):
self.reader = asyncio.StreamReader(loop = self.loop)
self.reader_task = None

def _send_json(self, sync_rep, flags):
async def _send_json(self, sync_rep, flags):
js = bytes(json.dumps(sync_rep), 'utf-8')
protocol_logger.debug("#{c}: Sending `{js}' to {d} (flags {f})".format(
js = js, d = self.dest,
Expand Down
2 changes: 1 addition & 1 deletion entanglement/websocket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def close(self):
self.ws_handler.close()
self.connection_lost(None)

def _send_json(self, sync_rep, flags):
async def _send_json(self, sync_rep, flags):
sync_rep['_flags'] = int(flags)
js = bytes(json.dumps(sync_rep), 'utf-8')
protocol_logger.debug("#{c}: Sending `{js}' to {d} (flags {f})".format(
Expand Down