COOK-2611 Reworking to allow for renaming of default queue

Cameron Johnston · Cameron Johnston · commit 8e350caecafd · 2013-04-09T05:54:30.000-06:00
diff --git a/providers/celery.rb b/providers/celery.rb
@@ -61,7 +61,14 @@
   end
 
   cmds = {}
-  cmds[:celeryd] = "celeryd -Q #{new_resource.queues.join(',')} #{new_resource.celerycam ? "-E" : ""}" if new_resource.celeryd
+  if new_resource.celeryd
+    case new_resource.queues.class.name
+    when "Array"
+      cmds[:celeryd] = "celeryd -Q #{new_resource.queues.join(',')} #{new_resource.celerycam ? "-E" : ""}"
+    when "NilClass"
+      cmds[:celeryd] = "celeryd #{new_resource.celerycam ? "-E" : ""}"
+    end
+  end
   cmds[:celerybeat] = "celerybeat" if new_resource.celerybeat
   if new_resource.celerycam
     if new_resource.django
diff --git a/resources/celery.rb b/resources/celery.rb
@@ -28,7 +28,7 @@
 attribute :celerycam, :kind_of => [TrueClass, FalseClass], :default => false
 attribute :camera_class, :kind_of => [String, NilClass], :default => nil
 attribute :environment, :kind_of => [Hash], :default => {}
-attribute :queues, :kind_of => [Array], :default => ['celery']
+attribute :queues, :kind_of => [Array,NilClass], :default => nil
 
 def config_base
   config.split(/[\\\/]/).last
