From d9793e09b63b02c6432b22d9d08110e828bb7472 Mon Sep 17 00:00:00 2001
From: jc00ke <jesse@jc00ke.com>
Date: Wed, 21 Mar 2012 20:44:21 -0700
Subject: [PATCH] Updating chef recipe

Pulled in some updates from the project that spawned the cookbook.
---
 examples/chef/cookbooks/sidekiq/README.rdoc                 | 4 ++++
 examples/chef/cookbooks/sidekiq/recipes/default.rb          | 3 ++-
 .../chef/cookbooks/sidekiq/templates/default/sidekiq.erb    | 4 ++--
 .../cookbooks/sidekiq/templates/default/sidekiq.yml.erb     | 6 ------
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/examples/chef/cookbooks/sidekiq/README.rdoc b/examples/chef/cookbooks/sidekiq/README.rdoc
index 68b850af..c2e7dace 100644
--- a/examples/chef/cookbooks/sidekiq/README.rdoc
+++ b/examples/chef/cookbooks/sidekiq/README.rdoc
@@ -5,3 +5,7 @@ Sidekiq is a Redis-backed Ruby library for creating background jobs, placing tho
 = USAGE: 
 
 add require_recipe "sidekiq" to main/recipes/default.rb
+
+= NOTES:
+
+I setup a basic size for the Sidekiq workers based on the instance_type, if you need more or less workers please modify the recipe itself.  
diff --git a/examples/chef/cookbooks/sidekiq/recipes/default.rb b/examples/chef/cookbooks/sidekiq/recipes/default.rb
index a7503912..9a918ccb 100644
--- a/examples/chef/cookbooks/sidekiq/recipes/default.rb
+++ b/examples/chef/cookbooks/sidekiq/recipes/default.rb
@@ -2,7 +2,8 @@
 # Cookbook Name:: sidekiq
 # Recipe:: default
 #
-if ['solo', 'util'].include?(node[:instance_role])
+role = node[:instance_role]
+if role == 'solo' || (role == 'util' && node[:name] =~ /sidekiq/)
 
   # for now
   worker_count = 1
diff --git a/examples/chef/cookbooks/sidekiq/templates/default/sidekiq.erb b/examples/chef/cookbooks/sidekiq/templates/default/sidekiq.erb
index 1df69aba..ad7fc982 100644
--- a/examples/chef/cookbooks/sidekiq/templates/default/sidekiq.erb
+++ b/examples/chef/cookbooks/sidekiq/templates/default/sidekiq.erb
@@ -140,13 +140,13 @@ APP_SHARED="${APP_DIR}/shared"
 APP_CONFIG="${APP_SHARED}/config"
 
 if [ -e "${APP_CONFIG}/${CONF_FILE}" ]; then
-  logger -t "sidekiq_${APP}" -s "Good, found a config file. Proceeding..."
+  logger -t "sidekiq_${APP}" -s "Good, found a conf file. Proceeding..."
 else
   logger -t "sidekiq_${APP}" -s "/data/${APP}/shared/config/${CONF_FILE} not found for app: ${APP}"
   exit 1
 fi
 
-WORKER_REF=`echo $CONF_FILE | sed s/.yml.conf//`
+WORKER_REF=`echo $CONF_FILE | sed s/.conf//`
 LOG_FILE="$APP_ROOT/log/$WORKER_REF.log"
 LOCK_FILE="/tmp/$WORKER_REF.monit-lock"
 PID_FILE="/var/run/engineyard/sidekiq/$APP/$WORKER_REF.pid"
diff --git a/examples/chef/cookbooks/sidekiq/templates/default/sidekiq.yml.erb b/examples/chef/cookbooks/sidekiq/templates/default/sidekiq.yml.erb
index 2c28ded1..23f8053e 100644
--- a/examples/chef/cookbooks/sidekiq/templates/default/sidekiq.yml.erb
+++ b/examples/chef/cookbooks/sidekiq/templates/default/sidekiq.yml.erb
@@ -2,12 +2,6 @@
 <% if @verbose %>
 :verbose: <%= @verbose %>
 <% end %>
-<% if @namespace %>
-:namespace: <%= @namespace %>
-<% end %>
-<% if @server %>
-:server: <%= @server %>
-<% end %>
 <% if @environment %>
 :environment: <%= @environment %>
 <% end %>