gandc/mtprotoproxy
1
0
Fork 0
mirror of https://github.com/alexbers/mtprotoproxy.git synced 2026-03-14 07:13:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor task canceling a bit

Browse Source
This commit is contained in:
Alexander Bersenev
2018-06-26 20:39:43 +05:00
parent ed088d9449
commit 444a1876b6
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mtprotoproxy.py
View File

@@ -801,18 +801,22 @@ async def handle_client(reader_clt, writer_clt):
update_stats(user, octets=len(data)) update_stats(user, octets=len(data))
wr.write(data, extra) wr.write(data, extra)
await wr.drain() await wr.drain()
except (OSError, AttributeError, asyncio.streams.IncompleteReadError) as e: except (OSError, asyncio.streams.IncompleteReadError) as e:
# print_err(e) # print_err(e)
pass pass
finally: finally:
wr.transport.abort() wr.transport.abort()
task_tg_to_clt = connect_reader_to_writer(reader_tg, writer_clt, user) task_tg_to_clt = asyncio.ensure_future(connect_reader_to_writer(reader_tg, writer_clt, user))
task_clt_to_tg = connect_reader_to_writer(reader_clt, writer_tg, user) task_clt_to_tg = asyncio.ensure_future(connect_reader_to_writer(reader_clt, writer_tg, user))
update_stats(user, curr_connects=1) update_stats(user, curr_connects=1)
await asyncio.wait([task_tg_to_clt, task_clt_to_tg], return_when=asyncio.FIRST_COMPLETED) await asyncio.wait([task_tg_to_clt, task_clt_to_tg], return_when=asyncio.FIRST_COMPLETED)
update_stats(user, curr_connects=-1) update_stats(user, curr_connects=-1)
task_tg_to_clt.cancel()
task_clt_to_tg.cancel()
writer_tg.transport.abort() writer_tg.transport.abort()