Merge pull request #28 from dprince/master

Config updates for 3.0.
dprince · Jan 16, 2012 · 3d616b9 · 3d616b9
2 parents 8a7b0e9 + 72cce3c
commit 3d616b9
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,4 @@
+* Mon Jan 16 2012 Dan Prince <[email protected]> - 3.0.0
   - Upgrade to Rails 3.1.
   - Add support for OpenStack API.
   - Reservations.

diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -31,7 +31,7 @@
   # config.force_ssl = true
 
   # See everything in the log (default is :info)
-  # config.log_level = :debug
+  config.log_level = :warn
 
   # Use a different logger for distributed setups
   # config.logger = SyslogLogger.new

diff --git a/contrib/bin/cloud-servers-vpc-cleanup b/contrib/bin/cloud-servers-vpc-cleanup
diff --git a/contrib/cron/cleanup b/contrib/cron/cleanup
@@ -0,0 +1 @@
+*/15 * * * * cloud_servers_vpc cd /opt/cloud_servers_vpc && RAILS_ENV=production PATH=/usr/local/bin/:$PATH ./script/rails runner ./contrib/runner_scripts/cleanup_servers.rb
diff --git a/contrib/cron/cloud-servers-vpc b/contrib/cron/cloud-servers-vpc
diff --git a/contrib/cron/reservations b/contrib/cron/reservations
@@ -0,0 +1 @@
+*/5 * * * * cloud_servers_vpc cd /opt/cloud_servers_vpc && RAILS_ENV=production PATH=/usr/local/bin/:$PATH ./script/rails runner ./contrib/runner_scripts/sync_reservations.rb
diff --git a/script/stop_workers b/script/stop_workers
@@ -1,5 +1,5 @@
 #!/bin/bash
-WORKER_PIDS=$(ps -e -o pid,command | grep [r]esque | cut -d " " -f 1 | xargs)
+WORKER_PIDS=$(resque list | sed -e "s|.*:\([0-9]*\):.*|\1|g" | xargs)
 kill -QUIT $WORKER_PIDS
 ret=$?
 if [ $ret -eq 0 ]; then
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/15 * * * cloud_servers_vpc cd /opt/cloud_servers_vpc && RAILS_ENV=production PATH=/usr/local/bin/:$PATH ./script/rails runner ./contrib/runner_scripts/cleanup_servers.rb
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/5 * * * cloud_servers_vpc cd /opt/cloud_servers_vpc && RAILS_ENV=production PATH=/usr/local/bin/:$PATH ./script/rails runner ./contrib/runner_scripts/sync_reservations.rb