Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

register as worker after tvpaint first steps

Browse source
This commit is contained in:
iLLiCiTiT 2021-10-12 15:44:57 +02:00
parent b458f27035
commit 8634d4f3d6
3 changed files with 25 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
openpype/modules/default_modules/job_queue/job_server/utils.py
View file

@ -25,7 +25,6 @@ def main(port=None, host=None):
port = int(port or 8079) port = int(port or 8079)
host = str(host or "localhost") host = str(host or "localhost")
print(host, port)
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as con: with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as con:
result_of_check = con.connect_ex((host, port)) result_of_check = con.connect_ex((host, port))

29
openpype/modules/default_modules/job_queue/job_workers/base_worker.py
View file

@ -81,12 +81,12 @@ class WorkerJobsConnection:
else: else:
self.client.finish_job(success, message, data) self.client.finish_job(success, message, data)
async def main_loop(self): async def main_loop(self, register_worker=True):
self._is_running = True self._is_running = True
while not self._stopped: while not self._stopped:
start_time = datetime.datetime.now() start_time = datetime.datetime.now()
await self._connection_loop() await self._connection_loop(register_worker)
delta = datetime.datetime.now() - start_time delta = datetime.datetime.now() - start_time
print("Connection loop took {}s".format(str(delta))) print("Connection loop took {}s".format(str(delta)))
# Check if was stopped and stop while loop in that case # Check if was stopped and stop while loop in that case
@ -111,7 +111,7 @@ class WorkerJobsConnection:
except Exception: except Exception:
traceback.print_exception(*sys.exc_info()) traceback.print_exception(*sys.exc_info())
async def _connection_loop(self): async def _connection_loop(self, register_worker):
self._connecting = True self._connecting = True
future = asyncio.run_coroutine_threadsafe( future = asyncio.run_coroutine_threadsafe(
self._connect(), loop=self._loop self._connect(), loop=self._loop
@ -143,13 +143,10 @@ class WorkerJobsConnection:
self.client = None self.client = None
return return
worker_id = await self.client.call( print("Connected to job queue server")
"register_worker", [self._host_name] if register_worker:
) self.register_as_worker()
self.client.set_id(worker_id)
print(
"Registered as worker with id {}".format(worker_id)
)
while self._connected and self._loop.is_running(): while self._connected and self._loop.is_running():
if self._stopped or ws.closed: if self._stopped or ws.closed:
break break
@ -158,6 +155,18 @@ class WorkerJobsConnection:
await self._stop_cleanup() await self._stop_cleanup()
def register_as_worker(self):
asyncio.ensure_future(self._register_as_worker(), loop=self._loop)
async def _register_as_worker(self):
worker_id = await self.client.call(
"register_worker", [self._host_name]
)
self.client.set_id(worker_id)
print(
"Registered as worker with id {}".format(worker_id)
)
async def disconnect(self): async def disconnect(self):
await self._stop_cleanup() await self._stop_cleanup()

7
openpype/modules/default_modules/job_queue/job_workers/tvpaint_worker.py
View file

@ -24,11 +24,16 @@ class WorkerCommunicator(BaseCommunicator):
self._server_url, "tvpaint", loop self._server_url, "tvpaint", loop
) )
asyncio.ensure_future( asyncio.ensure_future(
self._worker_connection.main_loop(), loop=loop self._worker_connection.main_loop(register_worker=False),
loop=loop
) )
super()._start_webserver() super()._start_webserver()
def _on_client_connect(self, *args, **kwargs):
super()._on_client_connect(*args, **kwargs)
self._worker_connection.register_as_worker()
def stop(self): def stop(self):
self._worker_connection.stop() self._worker_connection.stop()
self.return_code = 0 self.return_code = 0