Skip to content

Commit f225c14

Browse files
author
Cameron Johnston
committed
COOK-2747 Optionally emit events without a local celerycam process
1 parent 8ecb85a commit f225c14

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

providers/celery.rb

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,18 @@
6060
variables :broker => new_resource.broker, :results => new_resource.results
6161
end
6262

63+
if new_resource.celerycam
64+
# turn on events automatically, if we are going to run celerycam
65+
new_resource.celeryevents(true)
66+
end
67+
6368
cmds = {}
6469
if new_resource.celeryd
6570
case new_resource.queues
6671
when Array
67-
cmds[:celeryd] = "celeryd -Q #{new_resource.queues.join(',')} #{new_resource.celerycam ? "-E" : ""}"
72+
cmds[:celeryd] = "celeryd -Q #{new_resource.queues.join(',')} #{new_resource.celeryevents ? "-E" : ""}"
6873
when NilClass
69-
cmds[:celeryd] = "celeryd #{new_resource.celerycam ? "-E" : ""}"
74+
cmds[:celeryd] = "celeryd #{new_resource.celeryevents ? "-E" : ""}"
7075
end
7176
end
7277
cmds[:celerybeat] = "celerybeat" if new_resource.celerybeat

resources/celery.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
attribute :celerybeat, :kind_of => [TrueClass, FalseClass], :default => false
2828
attribute :celerycam, :kind_of => [TrueClass, FalseClass], :default => false
2929
attribute :camera_class, :kind_of => [String, NilClass], :default => nil
30+
attribute :celeryevents, :kind_of => [TrueClass, FalseClass], :default => false
3031
attribute :environment, :kind_of => [Hash], :default => {}
3132
attribute :queues, :kind_of => [Array,NilClass], :default => nil
3233

0 commit comments

Comments
 (0)