Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

events bootstep disabled if no events #5807

Merged
merged 3 commits into from Nov 13, 2019
Merged

events bootstep disabled if no events #5807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
97fe6b2
Merge pull request #2 from celery/master
anilaratna2 Sep 16, 2019
4815dba
events bootstep disabled if no events
anilaratna2 Oct 31, 2019
d49af88
Added unit tests.
thedrow Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions celery/worker/consumer/events.py
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@ def __init__(self, c,
not without_gossip or
not without_heartbeat
)
self.enabled = self.send_events
c.event_dispatcher = None
super(Events, self).__init__(c, **kwargs)

Expand Down
2 changes: 1 addition & 1 deletion celery/worker/strategy.py
View file
Open in desktop
Expand Up @@ -116,7 +116,7 @@ def default(task, app, consumer,
# (optimized to avoid calling request.send_event)
eventer = consumer.event_dispatcher
events = eventer and eventer.enabled
send_event = eventer.send
send_event = eventer and eventer.send
task_sends_events = events and task.send_events

call_at = consumer.timer.call_at
Expand Down
20 changes: 17 additions & 3 deletions t/unit/bin/test_worker.py
View file
Open in desktop
Expand Up @@ -70,6 +70,7 @@ def test_run_from_argv_basic(self):

def run(*args, **kwargs):
pass

x.run = run
x.run_from_argv('celery', [])
x.maybe_detach.assert_called()
Expand Down Expand Up @@ -210,10 +211,10 @@ def test_init_queues(self):
assert 'celery' not in app.amqp.queues.consume_from

c.task_create_missing_queues = False
del(app.amqp.queues)
del (app.amqp.queues)
with pytest.raises(ImproperlyConfigured):
self.Worker(app=self.app).setup_queues(['image'])
del(app.amqp.queues)
del (app.amqp.queues)
c.task_create_missing_queues = True
worker = self.Worker(app=self.app)
worker.setup_queues(['image'])
Expand Down Expand Up @@ -374,6 +375,20 @@ def on_worker_ready(**kwargs):
self.Worker(app=self.app).on_consumer_ready(object())
assert worker_ready_sent[0]

def test_disable_task_events(self):
worker = self.Worker(app=self.app, task_events=False,
without_gossip=True,
without_heartbeat=True)
consumer_steps = worker.blueprint.steps['celery.worker.components.Consumer'].obj.steps
assert not any(True for step in consumer_steps
if step.alias == 'Events')

def test_enable_task_events(self):
worker = self.Worker(app=self.app, task_events=True)
consumer_steps = worker.blueprint.steps['celery.worker.components.Consumer'].obj.steps
assert any(True for step in consumer_steps
if step.alias == 'Events')


@mock.stdouts
class test_funs:
Expand Down Expand Up @@ -422,7 +437,6 @@ def test_main(self):

@mock.stdouts
class test_signal_handlers:

class _Worker(object):
hostname = 'foo'
stopped = False
Expand Down