Merge pull request pedroaxl#2 from bargeapp/master

use opsworks native deploy_to and rails_env

README.md

@@ -6,38 +6,74 @@ This is a very simple cookbook to deploy a pool of resque workers directly in Am
 
 # Usage
 
-In your custom layer, you must add this recipes to each stage
+## Rails App Server layer type
 
-**Configure**
+If you're using a _Rails App Server_ layer type you'll need to add the following custom recipes to your layer:
 
-rails::configure
-opsworks-resque::configure
+**Setup**
+
+opsworks-resque::setup
 
 **Deploy**
 
-deploy::rails
 opsworks-resque::restart
 
-**Shutdown**
+**Undeploy**
 
 opsworks-resque::stop
 
+## Other layer types
+
+If you're using another layer type you'll need to configure some Rails recipes too:
+
+**Setup**
+
+opsworks-resque::setup
+
+**Configure**
+
+rails::configure
+
+**Deploy**
+
+deploy::rails opsworks-resque::restart
+
+**Undeploy**
+
+opsworks-resque::stop deploy::rails-undeploy
+
 # Attributes
 
 It expects an array with the queues of workers to run, for example
-```ruby
-default['resque']['path'] = "/srv/www/mailee_staging/current"
-default['resque']['workers'] = {"*" => 2, "images" => 1} # 2 workers for queue * and 1 worker for queue images
-default['resque']['rails_env'] = "production"
+```json
+"resque": {
+  "app-name": {
+    "workers": {
+      "*": 1
+    }
+  }
+}
+```
 
+if you're not using the _Rails App Server_ layer type you'll also need to specify a `rails_env` like so:
+
+```json
+"resque": {
+  "app-name": {
+    "rails_env": "development",
+    "workers": {
+      "*": 1
+    }
+  }
+}
 ```
 
 # Recipes
 
-**opsworks-resque::configure** - initial setup
+**opsworks-resque::setup** - initial setup
 **opsworks-resque::restart** - restart the workers (after deploy)
 **opsworks-resque::stop** - stop the workers (shutdown)
 
 # Author
 
-Author:: Pedro Axelrud (<pedroaxl@gmail.com>)
+Author:: Pedro Axelrud (<pedroaxl@gmail.com>)

attributes/setup.rb

@@ -0,0 +1 @@
+default[:resque][:workers] = { '*' => 1 }

recipes/restart.rb

@@ -1,4 +1,6 @@
-service 'resque' do
-  action [:stop, :start]
-  provider Chef::Provider::Service::Upstart
+node[:deploy].each do |application, deploy|
+  service "resque-#{application}" do
+    action [:stop, :start]
+    provider Chef::Provider::Service::Upstart
+  end
 end

recipes/setup.rb

@@ -0,0 +1,34 @@
+#
+# Cookbook Name:: opsworks-resque
+# Recipe:: default
+#
+# Copyright (C) 2014 PEDRO AXELRUD
+#
+# All rights reserved - Do Not Redistribute
+#
+
+node[:deploy].each do |application, deploy|
+
+  Chef::Log.info("Configuring resque for application #{application}")
+
+  template "/etc/init/resque-#{application}.conf" do
+    source "resque.conf.erb"
+    mode '0644'
+    variables deploy: deploy
+  end
+
+  settings = node[:resque][application]
+  # configure rails_env in case of non-rails app
+  rack_env = deploy[:rails_env] || settings[:rack_env] || settings[:rails_env]
+  settings[:workers].each do |queue, quantity|
+
+    quantity.times do |idx|
+      idx = idx + 1 # make index 1-based
+      template "/etc/init/resque-#{application}-#{idx}.conf" do
+        source "resque-n.conf.erb"
+        mode '0644'
+        variables application: application, rack_env: rack_env, deploy: deploy, queue: queue, instance: idx
+      end
+    end
+  end
+end

templates/default/resque-n.conf.erb

@@ -1,8 +1,13 @@
 #!upstart
 description "Resque worker <%= @instance %> <%= @queue %>"
 respawn
+start on starting resque-<%= @application %>
+stop on stopping resque-<%= @application %>
 
-start on starting resque
-stop on stopping resque
+env QUEUE=<%= @queue %>
+env RACK_ENV=<%= @rack_env %>
+env TERM_CHILD=1
 
-exec su - deploy -c 'cd <%= node['resque']['path'] %>; QUEUE=<%= @queue %> VERBOSE=1 RAILS_ENV=<%= node['resque']['rails_env'] %> bundle exec rake resque:work >> /var/log/resque/<%= @instance %>.log 2>&1'
+chdir <%= @deploy[:deploy_to] %>/current
+
+exec sudo -u deploy -E -- bundle exec rake resque:work >> /var/log/resque/<%= @application %>-<%= @instance %>.log 2>&1

templates/default/resque.conf.erb

@@ -1,6 +1,11 @@
 #!upstart
 description "Resque workers"
 
+<% @deploy[:environment].each do |k,v| %>
+env <%= k %>=<%= v %>
+export <%= k %>
+<% end %>
+
 pre-start script
 
 bash << "EOF"