diff options
author | Jate Sujjavanich <jatedev@gmail.com> | 2022-01-21 14:51:42 +0000 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2022-01-21 06:28:37 -1000 |
commit | be6ecc160ac4a8d9715257b9b955363cecc081ea (patch) | |
tree | 8af093b78742de1678fc41486af03ce7c7d696bf /lib | |
parent | e6d75e0beb95aa0cdf82bbc0a6b767c7f6cfcfc0 (diff) | |
download | bitbake-contrib-be6ecc160ac4a8d9715257b9b955363cecc081ea.tar.gz |
hashserv: specify loop for asyncio in python < 3.6
[YOCTO #14697]
Detect python version 3.5 restoring loop argument where
it is still required. In 3.6 auto loop detection is available.
Bitbake 1.46 is used in dunfell which lists a minimum python version
of 3.5. Omitting this argument leads to a regression and hang during
"Initialising tasks" at 44%.
Signed-off-by: Jate Sujjavanich <jatedev@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/hashserv/server.py | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/lib/hashserv/server.py b/lib/hashserv/server.py index 56f354bd0..f38a22ad9 100644 --- a/lib/hashserv/server.py +++ b/lib/hashserv/server.py @@ -12,6 +12,7 @@ import math import os import signal import socket +import sys import time from . import chunkify, DEFAULT_MAX_CHUNK @@ -419,9 +420,14 @@ class Server(object): self._cleanup_socket = None def start_tcp_server(self, host, port): - self.server = self.loop.run_until_complete( - asyncio.start_server(self.handle_client, host, port) - ) + if sys.version_info[0] == 3 and sys.version_info[1] < 6: + self.server = self.loop.run_until_complete( + asyncio.start_server(self.handle_client, host, port, loop=self.loop) + ) + else: + self.server = self.loop.run_until_complete( + asyncio.start_server(self.handle_client, host, port) + ) for s in self.server.sockets: logger.info('Listening on %r' % (s.getsockname(),)) @@ -444,9 +450,14 @@ class Server(object): try: # Work around path length limits in AF_UNIX os.chdir(os.path.dirname(path)) - self.server = self.loop.run_until_complete( - asyncio.start_unix_server(self.handle_client, os.path.basename(path)) - ) + if sys.version_info[0] == 3 and sys.version_info[1] < 6: + self.server = self.loop.run_until_complete( + asyncio.start_unix_server(self.handle_client, os.path.basename(path), loop=self.loop) + ) + else: + self.server = self.loop.run_until_complete( + asyncio.start_unix_server(self.handle_client, os.path.basename(path)) + ) finally: os.chdir(cwd) |