diff --git a/examples/chef/cookbooks/sidekiq/README.rdoc b/examples/chef/cookbooks/sidekiq/README.rdoc index 68b850aff..c2e7dacee 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 a7503912e..9a918ccb9 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 1df69abad..ad7fc9828 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 2c28ded1b..23f8053eb 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 %>