Merge pull request poise#36 from poise/scopefix

coderanger · coderanger · commit 99732e5fa03f · 2013-12-04T13:41:33.000-08:00
Scope fix for restart_command
diff --git a/providers/celery.rb b/providers/celery.rb
@@ -27,10 +27,11 @@
   raise "You must specify an application module to load" unless new_resource.config
 
   if !new_resource.restart_command
+    r = new_resource
     new_resource.restart_command do
-      run_context.resource_collection.find(:supervisor_service => "#{new_resource.application.name}-celeryd").run_action(:restart) if new_resource.celeryd
-      run_context.resource_collection.find(:supervisor_service => "#{new_resource.application.name}-celerybeat").run_action(:restart) if new_resource.celerybeat
-      run_context.resource_collection.find(:supervisor_service => "#{new_resource.application.name}-celerycam").run_action(:restart) if new_resource.celerycam
+      run_context.resource_collection.find(:supervisor_service => "#{r.application.name}-celeryd").run_action(:restart) if r.celeryd
+      run_context.resource_collection.find(:supervisor_service => "#{r.application.name}-celerybeat").run_action(:restart) if r.celerybeat
+      run_context.resource_collection.find(:supervisor_service => "#{r.application.name}-celerycam").run_action(:restart) if r.celerycam
     end
   end
 
diff --git a/providers/gunicorn.rb b/providers/gunicorn.rb
@@ -34,8 +34,9 @@
   end
 
   if !new_resource.restart_command
+    r = new_resource
     new_resource.restart_command do
-      run_context.resource_collection.find(:supervisor_service => new_resource.application.name).run_action(:restart)
+      run_context.resource_collection.find(:supervisor_service => r.application.name).run_action(:restart)
     end
   end
 
