From 8690154603e74a301b6a37441fdb053e82c1a888 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= <sybren@stuvel.eu>
Date: Thu, 26 Jan 2017 14:58:32 +0100
Subject: [PATCH] =?UTF-8?q?Worker:=20"master"=20=E2=86=92=20"manager"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
packages/flamenco-worker-python/flamenco_worker/worker.py | 8 ++++----
packages/flamenco-worker-python/tests/test_worker.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/packages/flamenco-worker-python/flamenco_worker/worker.py b/packages/flamenco-worker-python/flamenco_worker/worker.py
index c38dbc79..dd1fb62b 100644
--- a/packages/flamenco-worker-python/flamenco_worker/worker.py
+++ b/packages/flamenco-worker-python/flamenco_worker/worker.py
@@ -76,9 +76,9 @@ class FlamencoWorker:
push_act_max_interval = attr.ib(default=PUSH_ACT_MAX_INTERVAL,
validator=attr.validators.instance_of(datetime.timedelta))
- # Futures that represent delayed calls to push_to_master().
+ # Futures that represent delayed calls to push_to_manager().
# They are scheduled when logs & activities are registered but not yet pushed. They are
- # cancelled when a push_to_master() actually happens for another reason. There are different
+ # cancelled when a push_to_manager() actually happens for another reason. There are different
# futures for activity and log pushing, as these can have different max intervals.
_push_log_to_manager = attr.ib(
default=None, init=False,
@@ -342,11 +342,11 @@ class FlamencoWorker:
if delay is not None:
delay_sec = delay.total_seconds()
- self._log.debug('Scheduled delayed push to master in %r seconds', delay_sec)
+ self._log.debug('Scheduled delayed push to manager in %r seconds', delay_sec)
await asyncio.sleep(delay_sec)
if self.shutdown_future.done():
- self._log.info('Shutting down, not pushing changes to master.')
+ self._log.info('Shutting down, not pushing changes to manager.')
self._log.info('Updating task %s with status %r and activity %r',
self.task_id, self.current_task_status, self.last_task_activity)
diff --git a/packages/flamenco-worker-python/tests/test_worker.py b/packages/flamenco-worker-python/tests/test_worker.py
index e4a6808c..db93effa 100644
--- a/packages/flamenco-worker-python/tests/test_worker.py
+++ b/packages/flamenco-worker-python/tests/test_worker.py
@@ -252,7 +252,7 @@ class TestWorkerTaskExecution(AbstractFWorkerTest):
class WorkerPushToMasterTest(AbstractFWorkerTest):
def test_one_activity(self):
- """A single activity should be sent to master within reasonable time."""
+ """A single activity should be sent to manager within reasonable time."""
from datetime import timedelta
@@ -307,7 +307,7 @@ class WorkerPushToMasterTest(AbstractFWorkerTest):
self.assertTrue(self.worker._push_act_to_manager.cancelled())
def test_one_log(self):
- """A single log should be sent to master within reasonable time."""
+ """A single log should be sent to manager within reasonable time."""
from datetime import timedelta
--
GitLab