Merge pull request engineyard#217 from ess/sidekiq-env-vars

Sidekiq runner honors env.custom

cookbooks/sidekiq/files/default/sidekiq

@@ -23,10 +23,17 @@ pid_file="${pid_dir}/${worker_ref}.pid"
 log_file="${app_root}/log/${worker_ref}.log"
 conf_file="/data/${app_name}/shared/config/${worker_ref}.yml"
 app_user=$(stat -L -c"%U" "${app_root}")
+custom_env="/data/${app_name}/shared/config/env.custom"
 
 sidekiq="${app_root}/ey_bundler_binstubs/sidekiq"
 sidekiqctl="${app_root}/ey_bundler_binstubs/sidekiqctl"
 
+# Load the custom env if it exists
+if [ -e "${custom_env}" ]
+then
+  source "${custom_env}"
+fi
+
 export HOME="/home/${app_user}"
 
 # change to current directory
@@ -55,15 +62,15 @@ start ()
   fi
 
   # start sidekiq
-  sudo -u "${app_user}" -H "${sidekiq}" -C "${conf_file}" -e "${rails_env}" -r "${app_root}" -P "${pid_file}" -L "${log_file}" &
+  sudo -u "${app_user}" -E -H "${sidekiq}" -C "${conf_file}" -e "${rails_env}" -r "${app_root}" -P "${pid_file}" -L "${log_file}" &
   exit $?
 }
 
 # stop sidekiq
 stop ()
 {
   # stop using sidekiqctl
-  sudo -u "${app_user}" -H "${sidekiqctl}" stop "${pid_file}"
+  sudo -u "${app_user}" -E -H "${sidekiqctl}" stop "${pid_file}"
   exit $?
 }