diff --git a/flamenco-worker.cfg b/flamenco-worker.cfg index 6f6034bb8e652a2eb9cad066c00ec78ad064c6fc..90f153df38d48fc0fda65c19f3e0dc64e3e65103 100644 --- a/flamenco-worker.cfg +++ b/flamenco-worker.cfg @@ -1,6 +1,6 @@ [flamenco-worker] manager_url = http://localhost:8083/ -job_types = sleep blender-render +task_types = sleep blender-render ffmpeg filemanage task_update_queue_db = flamenco-worker.db may_i_run_interval_seconds = 5 diff --git a/flamenco_worker/cli.py b/flamenco_worker/cli.py index 731a8458975cfcfe3cfe76f413192ed816a72a4a..fd39d1e072e9928119a6e4c2f0e2f262c30df5be 100644 --- a/flamenco_worker/cli.py +++ b/flamenco_worker/cli.py @@ -56,7 +56,7 @@ def main(): manager=fmanager, trunner=trunner, tuqueue=tuqueue, - job_types=confparser.value('job_types').split(), + task_types=confparser.value('task_types').split(), worker_id=confparser.value('worker_id'), worker_secret=confparser.value('worker_secret'), loop=loop, diff --git a/flamenco_worker/config.py b/flamenco_worker/config.py index ad400a7b935dfb5d72904cefde20f0b845582408..d3481cd7244b8bc4c555a75ee1db3ee2803bab29 100644 --- a/flamenco_worker/config.py +++ b/flamenco_worker/config.py @@ -15,7 +15,7 @@ CONFIG_SECTION = 'flamenco-worker' DEFAULT_CONFIG = { 'flamenco-worker': collections.OrderedDict([ ('manager_url', 'http://flamenco-manager/'), - ('job_types', 'sleep blender_render_simple'), + ('task_types', 'unknown sleep blender-render'), ('task_update_queue_db', 'flamenco-worker.db'), ('may_i_run_interval_seconds', '5'), ('worker_id', ''), diff --git a/flamenco_worker/worker.py b/flamenco_worker/worker.py index 08e4bd5291e0064ceaa2edc05f226ef68e236e00..1d67ee8c8fc189c997b32ca2a5a6f8dc04b06a74 100644 --- a/flamenco_worker/worker.py +++ b/flamenco_worker/worker.py @@ -33,7 +33,7 @@ class FlamencoWorker: manager = attr.ib(validator=attr.validators.instance_of(upstream.FlamencoManager)) trunner = attr.ib() # Instance of flamenco_worker.runner.TaskRunner tuqueue = attr.ib(validator=attr.validators.instance_of(upstream_update_queue.TaskUpdateQueue)) - job_types = attr.ib(validator=attr.validators.instance_of(list)) + task_types = attr.ib(validator=attr.validators.instance_of(list)) worker_id = attr.ib(validator=attr.validators.instance_of(str)) worker_secret = attr.ib(validator=attr.validators.instance_of(str)) @@ -132,7 +132,7 @@ class FlamencoWorker: json={ 'secret': self.worker_secret, 'platform': platform, - 'supported_job_types': self.job_types, + 'supported_task_types': self.task_types, 'nickname': hostname, }, auth=None, # explicitly do not use authentication diff --git a/tests/test_worker.py b/tests/test_worker.py index db93effa76a635d8c02153f6c13da8cd0206921c..c9f3b926db7a55ecac0e3392188c462c0e606c65 100644 --- a/tests/test_worker.py +++ b/tests/test_worker.py @@ -35,7 +35,7 @@ class AbstractFWorkerTest(AbstractWorkerTest): manager=self.manager, trunner=self.trunner, tuqueue=self.tuqueue, - job_types=['sleep', 'unittest'], + task_types=['sleep', 'unittest'], worker_id='1234', worker_secret='jemoeder', loop=self.asyncio_loop, @@ -87,7 +87,7 @@ class WorkerStartupTest(AbstractFWorkerTest): '/register-worker', json={ 'platform': detect_platform(), - 'supported_job_types': ['sleep', 'unittest'], + 'supported_task_types': ['sleep', 'unittest'], 'secret': self.worker.worker_secret, 'nickname': 'ws-unittest', }, @@ -121,7 +121,7 @@ class WorkerStartupTest(AbstractFWorkerTest): '/register-worker', json={ 'platform': detect_platform(), - 'supported_job_types': ['sleep', 'unittest'], + 'supported_task_types': ['sleep', 'unittest'], 'secret': self.worker.worker_secret, 'nickname': 'ws-unittest', }, @@ -153,7 +153,8 @@ class TestWorkerTaskExecution(AbstractFWorkerTest): 'name': 'sleep-14-26', 'status': 'processing', 'priority': 50, - 'job_type': 'sleep', + 'job_type': 'unittest', + 'task_type': 'sleep', 'commands': [ {'name': 'echo', 'settings': {'message': 'Preparing to sleep'}}, {'name': 'sleep', 'settings': {'time_in_seconds': 3}} @@ -211,7 +212,8 @@ class TestWorkerTaskExecution(AbstractFWorkerTest): 'name': 'sleep-14-26', 'status': 'processing', 'priority': 50, - 'job_type': 'sleep', + 'job_type': 'unittest', + 'task_type': 'sleep', 'commands': [ {'name': 'sleep', 'settings': {'time_in_seconds': 3}} ] @@ -386,7 +388,7 @@ class WorkerShutdownTest(AbstractWorkerTest): manager=self.manager, trunner=self.trunner, tuqueue=self.tuqueue, - job_types=['sleep', 'unittest'], + task_types=['sleep', 'unittest'], worker_id='1234', worker_secret='jemoeder', loop=self.asyncio_loop,