Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
Signed-off-by: Scott Seago <sseago(a)redhat.com>
---
aeolus-conductor.spec.in | 9 ---
conf/conductor-delayed_job | 77 --------------------
src/Rakefile | 7 --
src/config/environment.rb | 1 -
src/config/initializers/delayed_job.rb | 2 -
.../migrate/20110124103216_create_delayed_jobs.rb | 21 ------
src/script/delayed_job | 5 --
util/check_services | 2 +-
8 files changed, 1 insertions(+), 123 deletions(-)
delete mode 100755 conf/conductor-delayed_job
delete mode 100644 src/config/initializers/delayed_job.rb
delete mode 100644 src/db/migrate/20110124103216_create_delayed_jobs.rb
delete mode 100755 src/script/delayed_job
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index d2fb7f1..2977df3 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -34,7 +34,6 @@ Requires: rubygem(rest-client)
Requires: rubygem(builder)
Requires: rubygem(json)
Requires: rubygem(rack-restful_submit)
-Requires: rubygem(delayed_job)
Requires: rubygem(net-scp)
Requires: rubygem(uuidtools)
Requires: postgresql
@@ -194,7 +193,6 @@ done
# copy over init scripts and various config
%{__cp} conf/aeolus-conductor %{buildroot}%{_initrddir}
%{__cp} conf/conductor-dbomatic %{buildroot}%{_initrddir}
-%{__cp} conf/conductor-delayed_job %{buildroot}%{_initrddir}
%{__cp} conf/aeolus-conductor-httpd.conf
%{buildroot}%{_sysconfdir}/httpd/conf.d/aeolus-conductor.conf
%{__cp} conf/aeolus-conductor.logrotate
%{buildroot}%{_sysconfdir}/logrotate.d/aeolus-conductor
%{__cp} conf/aeolus-conductor.sysconf
%{buildroot}%{_sysconfdir}/sysconfig/aeolus-conductor
@@ -212,7 +210,6 @@ touch %{buildroot}%{_localstatedir}/log/%{name}/dbomatic.log
touch %{buildroot}%{_localstatedir}/run/%{name}/event_log_position
%{__mkdir} -p %{buildroot}%{app_root}/log
-touch %{buildroot}%{app_root}/log/delayed_job.log
# copy script files over
%{__cp} -r src/script %{buildroot}%{app_root}
@@ -247,7 +244,6 @@ fi
# Register the services
/sbin/chkconfig --add aeolus-conductor
/sbin/chkconfig --add conductor-dbomatic
-/sbin/chkconfig --add conductor-delayed_job
%preun daemons
if [ $1 = 0 ]; then
@@ -255,8 +251,6 @@ if [ $1 = 0 ]; then
/sbin/chkconfig --del aeolus-conductor
/sbin/service conductor-dbomatic stop > /dev/null 2>&1
/sbin/chkconfig --del conductor-dbomatic
- /sbin/service conductor-delayed_job stop > /dev/null 2>&1
- /sbin/chkconfig --del conductor-delayed_job
fi
%files
@@ -271,14 +265,12 @@ fi
%{app_root}/log
%{app_root}/public
%{app_root}/Rakefile
-%{app_root}/script/delayed_job
%config %{_sysconfdir}/%{name}
%doc AUTHORS COPYING
%files daemons
%{_initrddir}/aeolus-conductor
%{_initrddir}/conductor-dbomatic
-%{_initrddir}/conductor-delayed_job
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/aeolus-conductor
%config(noreplace) %{_sysconfdir}/sysconfig/conductor-rails
@@ -286,7 +278,6 @@ fi
%attr(-, aeolus, aeolus) %{_localstatedir}/lib/%{name}
%attr(-, aeolus, aeolus) %{_localstatedir}/run/%{name}
%attr(-, aeolus, aeolus) %{_localstatedir}/log/%{name}
-%attr(-, aeolus, aeolus) %{app_root}/log/delayed_job.log
%doc AUTHORS COPYING
%files doc
diff --git a/conf/conductor-delayed_job b/conf/conductor-delayed_job
deleted file mode 100755
index 9b7f517..0000000
--- a/conf/conductor-delayed_job
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/bash
-#
-#
-# conductor-delayed_job startup script for conductor-delayed_job
-#
-# chkconfig: - 99 01
-# description: conductor-delayed_job is service for running conductor
-# background jobs
-
-[ -r /etc/sysconfig/conductor-rails ] && . /etc/sysconfig/conductor-rails
-
-[ -r /etc/sysconfig/aeolus-conductor ] && . /etc/sysconfig/aeolus-conductor
-
-RAILS_ENV="${RAILS_ENV:-production}"
-CONDUCTOR_DIR="${CONDUCTOR_DIR:-/usr/share/aeolus-conductor}"
-AEOLUS_USER="${AEOLUS_USER:-aeolus}"
-DJOB_LOCKFILE="${DJOB_LOCKFILE:-/var/lock/subsys/conductor-delayed_job}"
-DJOB_PIDDIR="${DJOB_PIDDIR:-/var/run/aeolus-conductor/}"
-
-DJOB_PATH=$CONDUCTOR_DIR/script/
-DJOB_PROG=delayed_job
-DJOB_PIDFILE=$DJOB_PIDDIR/$DJOB_PROG.pid
-
-. /etc/init.d/functions
-
-start() {
- echo -n "Starting conductor-delayed_job: "
-
- daemon --user=$AEOLUS_USER $DJOB_PATH/$DJOB_PROG start --pid-dir=$DJOB_PIDDIR
- RETVAL=$?
- if [ $RETVAL -eq 0 ] && touch $DJOB_LOCKFILE ; then
- echo_success
- echo
- else
- echo_failure
- echo
- fi
-}
-
-stop() {
- echo -n "Shutting down conductor-delayed_job: "
- $DJOB_PATH/$DJOB_PROG stop --pid-dir=$DJOB_PIDDIR
- RETVAL=$?
- if [ $RETVAL -eq 0 ] && rm -f $DJOB_LOCKFILE ; then
- echo_success
- echo
- else
- echo_failure
- echo
- fi
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- status)
- status -p $DJOB_PIDFILE $DJOB_PROG
- RETVAL=$?
- ;;
- force-reload)
- restart
- ;;
- *)
- echo "Usage: conductor-delayed_job {start|stop|restart|status}"
- exit 1
- ;;
-esac
-
-exit $RETVAL
diff --git a/src/Rakefile b/src/Rakefile
index c1f9d60..37c683b 100644
--- a/src/Rakefile
+++ b/src/Rakefile
@@ -8,11 +8,4 @@ require 'rake'
require 'rake/testtask'
require 'rake/rdoctask'
-begin
- #gem 'delayed_job', :version => '~>2.0.4'
- require 'delayed/tasks'
-rescue LoadError
- STDERR.puts "Run `rake gems:install` to install delayed_job"
-end
-
require 'tasks/rails'
diff --git a/src/config/environment.rb b/src/config/environment.rb
index f657eca..5966b0d 100644
--- a/src/config/environment.rb
+++ b/src/config/environment.rb
@@ -50,7 +50,6 @@ Rails::Initializer.run do |config|
config.gem "typhoeus"
config.gem 'rest-client', :version => '>= 1.6.1'
config.gem 'rack-restful_submit', :version => '1.1.2'
- config.gem 'delayed_job', :version => '~>2.0.4'
config.gem 'net-scp', :lib => 'net/scp'
config.gem 'uuidtools'
diff --git a/src/config/initializers/delayed_job.rb
b/src/config/initializers/delayed_job.rb
deleted file mode 100644
index a8684b4..0000000
--- a/src/config/initializers/delayed_job.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-Delayed::Worker.backend = :active_record
-Delayed::Worker.max_attempts = 1
diff --git a/src/db/migrate/20110124103216_create_delayed_jobs.rb
b/src/db/migrate/20110124103216_create_delayed_jobs.rb
deleted file mode 100644
index 943ff9b..0000000
--- a/src/db/migrate/20110124103216_create_delayed_jobs.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-class CreateDelayedJobs < ActiveRecord::Migration
- def self.up
- create_table :delayed_jobs, :force => true do |table|
- table.integer :priority, :default => 0 # Allows some jobs to jump to the
front of the queue
- table.integer :attempts, :default => 0 # Provides for retries, but still
fail eventually.
- table.text :handler # YAML-encoded string of the object
that will do work
- table.text :last_error # reason for last failure (See Note
below)
- table.datetime :run_at # When to run. Could be Time.zone.now
for immediately, or sometime in the future.
- table.datetime :locked_at # Set when a client is working on this
object
- table.datetime :failed_at # Set when all retries have failed
(actually, by default, the record is deleted instead)
- table.string :locked_by # Who is working on this object (if
locked)
- table.timestamps
- end
-
- add_index :delayed_jobs, [:priority, :run_at], :name =>
'delayed_jobs_priority'
- end
-
- def self.down
- drop_table :delayed_jobs
- end
-end
diff --git a/src/script/delayed_job b/src/script/delayed_job
deleted file mode 100755
index edf1959..0000000
--- a/src/script/delayed_job
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-
-require File.expand_path(File.join(File.dirname(__FILE__), '..',
'config', 'environment'))
-require 'delayed/command'
-Delayed::Command.new(ARGV).daemonize
diff --git a/util/check_services b/util/check_services
index db0e930..8cd51e8 100755
--- a/util/check_services
+++ b/util/check_services
@@ -1,5 +1,5 @@
#!/usr/bin/ruby
-init_scripts=%w(aeolus-conductor condor conductor-delayed_job deltacloud-core
deltacloud-ec2-us-east-1 deltacloud-ec2-us-west-1 deltacloud-mock httpd imagefactory iwhd
libvirtd mongod ntpd postgresql qpidd)
+init_scripts=%w(aeolus-conductor condor deltacloud-core deltacloud-ec2-us-east-1
deltacloud-ec2-us-west-1 deltacloud-mock httpd imagefactory iwhd libvirtd mongod ntpd
postgresql qpidd)
init_scripts.each do |script|
puts "\nChecking #{script} ..."
--
1.7.4.4