From: Jan Provaznik <jprovazn(a)redhat.com>
---
aeolus-conductor.spec.in | 13 +----
conf/conductor-warehouse_sync | 78 --------------------------
src/warehouse_sync/warehouse_sync-server | 89 ------------------------------
src/warehouse_sync/warehouse_sync.rb | 52 -----------------
4 files changed, 1 insertions(+), 231 deletions(-)
delete mode 100755 conf/conductor-warehouse_sync
delete mode 100755 src/warehouse_sync/warehouse_sync-server
delete mode 100644 src/warehouse_sync/warehouse_sync.rb
diff --git a/aeolus-conductor.spec.in b/aeolus-conductor.spec.in
index 41c634d..dadebef 100644
--- a/aeolus-conductor.spec.in
+++ b/aeolus-conductor.spec.in
@@ -152,8 +152,7 @@ rb="app/models app/controllers \
app/services app/util \
config config/initializers config/environments db db/migrate dutils \
features/support features/step_definitions lib public spec \
- spec/controllers spec/factories spec/helpers spec/models spec/services \
- warehouse_sync"
+ spec/controllers spec/factories spec/helpers spec/models spec/services"
rhtml="app/views/layouts"
scss="app/stylesheets"
svg="public/images public/images/icons public/javascripts/jquery-svg"
@@ -188,16 +187,12 @@ done
%{__mkdir} -p %{buildroot}%{app_root}/dbomatic
%{__cp} src/dbomatic/dbomatic %{buildroot}%{app_root}/dbomatic
-%{__mkdir} -p %{buildroot}%{app_root}/warehouse_sync
-%{__cp} src/warehouse_sync/warehouse_sync-server %{buildroot}%{app_root}/warehouse_sync
-
# move documentation to the correct place
%{__cp} src/doc/* %{buildroot}/%{doc_root}
# copy over init scripts and various config
%{__cp} conf/aeolus-conductor %{buildroot}%{_initrddir}
%{__cp} conf/conductor-dbomatic %{buildroot}%{_initrddir}
-%{__cp} conf/conductor-warehouse_sync %{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
@@ -214,7 +209,6 @@ touch %{buildroot}%{_localstatedir}/log/%{name}/thin.log
touch %{buildroot}%{_localstatedir}/log/%{name}/rails.log
touch %{buildroot}%{_localstatedir}/log/%{name}/dbomatic.log
touch %{buildroot}%{_localstatedir}/run/%{name}/event_log_position
-touch %{buildroot}%{_localstatedir}/log/%{name}/warehouse_sync.log
%{__mkdir} -p %{buildroot}%{app_root}/log
touch %{buildroot}%{app_root}/log/delayed_job.log
@@ -257,7 +251,6 @@ fi
# Register the services
/sbin/chkconfig --add aeolus-conductor
/sbin/chkconfig --add conductor-dbomatic
-/sbin/chkconfig --add conductor-warehouse_sync
/sbin/chkconfig --add conductor-delayed_job
%preun daemons
@@ -266,8 +259,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-warehouse_sync stop > /dev/null 2>&1
- /sbin/chkconfig --del conductor-warehouse_sync
/sbin/service conductor-delayed_job stop > /dev/null 2>&1
/sbin/chkconfig --del conductor-delayed_job
fi
@@ -287,7 +278,6 @@ fi
%{app_root}/Rakefile
%{app_root}/script/delayed_job
%{app_root}/solr
-%{app_root}/warehouse_sync
%config %{_sysconfdir}/%{name}
%doc AUTHORS COPYING
@@ -295,7 +285,6 @@ fi
%defattr(-,root,root,-)
%{_initrddir}/aeolus-conductor
%{_initrddir}/conductor-dbomatic
-%{_initrddir}/conductor-warehouse_sync
%{_initrddir}/conductor-delayed_job
%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
%config(noreplace) %{_sysconfdir}/sysconfig/aeolus-conductor
diff --git a/conf/conductor-warehouse_sync b/conf/conductor-warehouse_sync
deleted file mode 100755
index 38b9f35..0000000
--- a/conf/conductor-warehouse_sync
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-#
-#
-# conductor-warehouse_sync startup script for conductor-warehouse_sync
-#
-# chkconfig: - 99 01
-# description: conductor-warehouse_sync populates the Conductor scheduler
-# from the Aeolus Conductor db
-
-[ -r /etc/sysconfig/conductor-rails ] && . /etc/sysconfig/conductor-rails
-
-[ -r /etc/sysconfig/aeolus-conductor ] && . /etc/sysconfig/aeolus-conductor
-
-CONDUCTOR_DIR="${CONDUCTOR_DIR:-/usr/share/aeolus-conductor}"
-REFRESHD_LOG="${REFRESHD_LOG:-/var/log/aeolus-conductor/warehouse_sync.log}"
-REFRESHD_PID="${REFRESHD_PID:-/var/run/aeolus-conductor/warehouse_sync.pid}"
-REFRESHD_LOCKFILE="${REFRESHD_LOCKFILE:-/var/lock/subsys/conductor-warehouse_sync}"
-AEOLUS_USER="${AEOLUS_USER:-aeolus}"
-
-REFRESHD_PATH=$CONDUCTOR_DIR/warehouse_sync
-REFRESHD_PROG=warehouse_sync-server
-
-. /etc/init.d/functions
-
-start() {
- echo -n "Starting conductor-warehouse_sync: "
-
- daemon --user=$AEOLUS_USER $REFRESHD_PATH/$REFRESHD_PROG
- RETVAL=$?
- if [ $RETVAL -eq 0 ] && touch $REFRESHD_LOCKFILE ; then
- echo_success
- echo
- else
- echo_failure
- echo
- fi
-}
-
-stop() {
- echo -n "Shutting down conductor-warehouse_sync: "
- killproc -p $REFRESHD_PID $REFRESHD_PROG
- RETVAL=$?
- if [ $RETVAL -eq 0 ] && rm -f $REFRESHD_LOCKFILE ; then
- echo_success
- echo
- else
- echo_failure
- echo
- fi
-}
-
-case "$1" in
- start)
- start
- ;;
- stop)
- stop
- ;;
- restart)
- stop
- start
- ;;
- reload)
- ;;
- force-reload)
- restart
- ;;
- status)
- status -p $REFRESHD_PID $REFRESHD_PROG
- RETVAL=$?
- ;;
- *)
- echo "Usage: conductor-warehouse_sync {start|stop|restart|status}"
- exit 1
- ;;
-esac
-
-exit $RETVAL
diff --git a/src/warehouse_sync/warehouse_sync-server
b/src/warehouse_sync/warehouse_sync-server
deleted file mode 100755
index 603a520..0000000
--- a/src/warehouse_sync/warehouse_sync-server
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/ruby
-
-$: << File.dirname(__FILE__)
-
-require 'rubygems'
-require 'optparse'
-require 'warehouse_sync'
-
-DELAY = 2
-WAREHOUSE_CONFIG = YAML.load_file(File.join(File.dirname(__FILE__),
"../config/image_warehouse.yml"))
-
-# show timestamp in log file
-class Logger
- def format_message(severity, timestamp, progname, msg)
- time = timestamp.getutc.strftime("%Y-%m-%d %H:%M:%S")
- "\n#{time}:#{severity.to_s.upcase}: #{msg}"
- end
-end
-
-help = false
-daemon = true
-log_dir = "/var/log/aeolus-conductor"
-pid_dir = "/var/run/aeolus-conductor"
-
-optparse = OptionParser.new do |opts|
-
- opts.banner = <<BANNER
-Usage:
-warehouse_sync [options]
-
-Options:
-BANNER
- opts.on( '-f', '--pid-file PATH', "Use PATH to the warehouse_sync
pid directory (defaults to #{pid_dir})") do |newpath|
- pid_dir = newpath
- end
- opts.on( '-h', '--help', '') { help = true }
- opts.on( '-l', '--log PATH', "Use PATH to the warehouse_sync log
directory (defaults to #{log_dir}). Use '-' for stdout") do |newpath|
- log_dir = newpath
- end
- opts.on( '-n', '--nodaemon', 'Do not daemonize (useful in
combination with -l for debugging)') { daemon = false }
-end
-
-begin
- optparse.parse!
-rescue OptionParser::InvalidOption => e
- puts "Invalid option #{e.args}"
- puts
- puts optparse
- exit(1)
-end
-
-if help
- puts optparse
- exit(0)
-end
-
-if log_dir == '-'
- LOG_FILE = STDOUT
-else
- LOG_FILE = "#{log_dir}/warehouse_sync.log"
-end
-
-logger = Logger.new(LOG_FILE)
-logger.level = Logger::INFO
-logger.datetime_format = "%Y-%m-%d %H:%M:%S"
-logger.info "Warehouse_sync starting up"
-
-def create_pid_file(file)
- FileUtils.mkdir_p File.dirname(file)
- open(file, "w") {|f| f.write(Process.pid) }
- File.chmod(0644, file)
-end
-
-# daemonize
-if daemon
- # note that this requires 'active_support', which we get for free from dutils
- Process.daemon
-end
-
-begin
- create_pid_file("#{pid_dir}/warehouse_sync.pid")
- WarehouseSync.new(:uri => WAREHOUSE_CONFIG['baseurl'], :logger => logger,
:delay => DELAY * 60).run
-rescue Exception => e
- logger.error "#{e.backtrace.shift}: #{e.message}"
- e.backtrace.each do |step|
- logger.error "\tfrom #{step}"
- end
- exit 1
-end
diff --git a/src/warehouse_sync/warehouse_sync.rb b/src/warehouse_sync/warehouse_sync.rb
deleted file mode 100644
index 4eb8529..0000000
--- a/src/warehouse_sync/warehouse_sync.rb
+++ /dev/null
@@ -1,52 +0,0 @@
-$: << File.join(File.dirname(__FILE__), "../dutils")
-
-require 'rubygems'
-require 'dutils'
-require 'warehouse_client'
-
-class WarehouseSync
- class NotFoundError < Exception;end
-
- def initialize(opts)
- @uri = opts[:uri]
- @delay = opts[:delay] || 10*60
- @logger = opts[:logger]
- ActiveRecord::Base.logger = @logger
- @whouse = Warehouse::Client.new(@uri)
- end
-
- def run
- while true
- begin
- @logger.info "***** Runnning warehouse sync"
- # TODO: I disabled template sync - legacy_templates should never
- # be changed by anything else than conductor
- #(a)logger.info "*** syncing legacy_templates"
- #Template.all.each do |i|
- # i.safe_warehouse_sync
- # i.save! if i.changed?
- #end
- @logger.info "*** syncing images"
- LegacyImage.all.each do |i|
- i.safe_warehouse_sync
- if i.changed?
- i.save! rescue @logger.error "failed to save image #{i.uuid}:
#{$!.message}"
- end
- end
- @logger.info "*** syncing provider images"
- LegacyProviderImage.all.each do |i|
- i.safe_warehouse_sync
- if i.changed?
- i.save! rescue @logger.error "failed to save image #{i.uuid}:
#{$!.message}"
- end
- end
- rescue => e
- @logger.error e.message
- @logger.error "backtrace:\n" + e.backtrace.join("\n ")
- ensure
- @logger.info "sleep #{@delay}"
- sleep @delay
- end
- end
- end
-end
--
1.7.4