worker.rb in flapjack-0.5.1

- old
+ new

@@ -4,11 +4,10 @@
 require 'beanstalk-client'
 require 'ostruct'
 require 'optparse'
 require 'log4r'
 require 'log4r/outputter/syslogoutputter'
-require 'flapjack/result'
 require 'flapjack/patches'
 
 module Flapjack
   class WorkerOptions
     def self.parse(args)
@@ -46,91 +45,7 @@
       options.checks_directory ||= File.join(File.dirname(__FILE__), '..', 'checks')
   
       options
     end
   end
- 
-  class Worker
-    
-    attr_accessor :jobs, :results, :log
-
-    def initialize(opts={})
-      @jobs    = Beanstalk::Pool.new(["#{opts[:host]}:#{opts[:port]}"], 'jobs')
-      @results = Beanstalk::Pool.new(["#{opts[:host]}:#{opts[:port]}"], 'results')
-      @sandbox = (opts[:check_directory] || File.expand_path(File.join(File.dirname(__FILE__), '..', 'checks')))
-
-      if opts[:logger]
-        @log = opts[:logger]
-      else
-        @log = Log4r::Logger.new('worker')
-        @log.add(Log4r::StdoutOutputter.new('worker'))
-        @log.add(Log4r::SyslogOutputter.new('worker'))
-      end
-    end
-    
-    def process_loop
-      @log.info("Booting main loop...")
-      loop do 
-        process_check
-      end
-    end
-
-    def process_check
-      # get next check off the beanstalk
-      job, check = get_check()
-
-      # do the actual check
-      result, retval = perform_check(check.command)
-
-      # report the results of the check
-      report_check(:result => result, :retval => retval, :check => check)
-     
-      # create another job for the check, delete current job
-      cleanup_job(:job => job, :check => check)
-    end
-
-    def perform_check(cmd)
-      command = "sh -c '#{@sandbox}/#{cmd}'"
-      @log.debug("Executing check: \"#{command}\"")
-      result = `#{command}`
-      retval = $?.exitstatus
-
-      return result, retval
-    end
-
-    def report_check(opts={})
-      raise ArgumentError unless (opts[:result] && opts[:retval] && opts[:check])
-
-      @log.debug "Reporting results for check id #{opts[:check].id}."
-      @results.yput({:id => opts[:check].id, 
-                     :output => opts[:result], 
-                     :retval => opts[:retval].to_i})
-    end
-
-    def cleanup_job(opts={})
-      raise ArgumentError unless (opts[:job] && opts[:check])
-
-      # add job back onto stack
-      @log.debug("Putting check back onto beanstalk.")
-      @jobs.yput(opts[:check].to_h, 65536, opts[:check].frequency)
-       
-      # FIXME: what happens when power goes out here?
-       
-      # once we're done, clean up
-      @log.debug("Deleting job.")
-      opts[:job].delete
-    end
-
-    def get_check
-      @log.debug("Waiting for check...")
-      job = @jobs.reserve
-      # FIXME: maybe wrap Result as Job now that Check is reserved?
-      check = Result.new(YAML::load(job.body))
-      @log.info("Got check with id #{check.id}")
-
-      return job, check
-    end
-
-  end
-
 end
-
+ 