flapjack 0.5.4 → 0.5.5

data/VERSION

@@ -1 +1 @@
-0.5.4
+0.5.5

data/bin/flapjack-worker

@@ -1,19 +1,10 @@
 #!/usr/bin/env ruby
 
-$: << File.dirname(__FILE__) + '/../lib' unless $:.include?(File.dirname(__FILE__) + '/../lib/')
+$: << File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib'))
 
 require 'flapjack/cli/worker'
 require 'flapjack/applications/worker'
 
-at_exit do 
-  puts "Shutting down"
-end
-
-trap("INT") do 
-  puts "Caught shutdown signal, cleaning up."
-  exit
-end
-
 @options = Flapjack::WorkerOptions.parse(ARGV)
 app = Flapjack::Worker::Application.run(:host => @options.host,
                                         :port => @options.port,

data/features/flapjack-worker-manager.feature

@@ -1,25 +1,27 @@
-Feature: flapjack-notifier-manager
+Feature: flapjack-worker-manager
   To scale Flapjack easily and efficiently
   A sysadmin
   Must be able to manage clusters of workers
+  With ease
+  From the command line
 
   Scenario: Running multiple workers
     Given the flapjack-worker-manager is on my path
     And beanstalkd is running on localhost
     And there are no instances of flapjack-worker running
-    When I run "flapjack-worker-manager start" 
+    When I run "flapjack-worker-manager start"
     Then 5 instances of "flapjack-worker" should be running
 
   Scenario: Running a specified number of workers
     Given the flapjack-worker-manager is on my path
     And beanstalkd is running on localhost
     And there are no instances of flapjack-worker running
-    When I run "flapjack-worker-manager start --workers=10" 
+    When I run "flapjack-worker-manager start --workers=10"
     Then 10 instances of "flapjack-worker" should be running
 
   Scenario: Stopping all workers
     Given there are 5 instances of the flapjack-worker running
     And beanstalkd is running on localhost
-    When I run "flapjack-worker-manager stop" 
+    When I run "flapjack-worker-manager stop"
     Then 0 instances of "flapjack-worker" should be running
 

data/features/flapjack-worker.feature

@@ -0,0 +1,27 @@
+Feature: flapjack-worker
+  To be alerted to problems
+  A user
+  Needs checks executed
+  On a regular schedule
+  And the results of those checks
+  Need to be reported
+
+  Scenario: Start a worker
+    Given beanstalkd is running
+    When I background run "flapjack-worker"
+    Then I should see "flapjack-worker" running
+    Then I should see "Waiting for check" in the "flapjack-worker" output
+
+  Scenario: Start a worker without beanstalk running
+    Given beanstalkd is not running
+    When I background run "flapjack-worker"
+    Then I should see "flapjack-worker" running
+    Then I should not see "Shutting down" in the "flapjack-worker" output
+
+  Scenario: Beanstalk disappears while worker running
+    Given beanstalkd is running
+    When I background run "flapjack-worker"
+    And beanstalkd is killed
+    Then I should see "flapjack-worker" running
+    Then I should not see "Shutting down" in the "flapjack-worker" output
+    Then I should see "went away" in the "flapjack-worker" output

data/features/steps/flapjack-importer_steps.rb

@@ -71,13 +71,13 @@ end
 Given /^beanstalkd is running$/ do
   system("which beanstalkd > /dev/null 2>&1").should be_true
 
-  @pipe = IO.popen("beanstalkd")
+  @beanstalk = IO.popen("beanstalkd")
 
   # So beanstalkd has a moment to catch its breath.
   sleep 0.5
 
   at_exit do
-    Process.kill("KILL", @pipe.pid)
+    Process.kill("KILL", @beanstalk.pid)
   end
 end
 

data/features/steps/flapjack-worker_steps.rb

@@ -0,0 +1,61 @@
+Given /^beanstalkd is not running$/ do
+  if @beanstalk
+    Process.kill("KILL", @beanstalk.pid)
+  end
+end
+
+Then /^I should see "([^"]*)" running$/ do |command|
+  instance_variable_name = "@" + command.split("-")[1]
+  pipe = instance_variable_get(instance_variable_name)
+  pipe.should_not be_nil
+  `ps -p #{pipe.pid}`.split("\n").size.should == 2
+end
+
+When /^I background run "flapjack-worker"$/ do
+  @root    = Pathname.new(File.dirname(__FILE__)).parent.parent.expand_path
+  bin_path = @root.join('bin')
+  command  = "#{bin_path}/flapjack-worker 2>&1"
+
+  @worker = IO.popen(command, 'r')
+
+  sleep 1
+
+  at_exit do
+    Process.kill("KILL", @worker.pid)
+  end
+end
+
+Then /^I should see "([^"]*)" in the "([^"]*)" output$/ do |string, command|
+  instance_variable_name = "@" + command.split("-")[1]
+  pipe = instance_variable_get(instance_variable_name)
+  pipe.should_not be_nil
+
+  @output = read_until_timeout(pipe, 4)
+  @output.grep(/#{string}/).size.should > 0
+end
+
+Then /^I should not see "([^"]*)" in the "([^"]*)" output$/ do |string, command|
+  instance_variable_name = "@" + command.split("-")[1]
+  pipe = instance_variable_get(instance_variable_name)
+  pipe.should_not be_nil
+
+  @output = read_until_timeout(pipe, 4)
+  @output.grep(/#{string}/).size.should == 0
+end
+
+When /^beanstalkd is killed$/ do
+  Given "beanstalkd is not running"
+end
+
+Then /^show me the output from "([^"]*)"$/ do |command|
+  instance_variable_name = "@" + command.split("-")[1]
+  pipe = instance_variable_get(instance_variable_name)
+  pipe.should_not be_nil
+
+  @output = read_until_timeout(pipe, 5)
+  puts @output
+end
+
+When /^I sleep "(\d+)" seconds$/ do |time|
+  sleep(time.to_i)
+end

data/features/support/env.rb

@@ -2,24 +2,50 @@
 
 $: << File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'lib'))
 
+require 'pathname'
 require 'yajl'
 require 'beanstalk-client'
 
-#require 'flapjack/inifile'
-#require 'flapjack/filters/ok'
-#require 'flapjack/filters/any_parents_failed'
-#require 'flapjack/notifier_engine'
-#require 'flapjack/transports/result'
-#require 'flapjack/transports/beanstalkd'
-#require 'flapjack/patches'
-#require 'flapjack/inifile'
-#require 'flapjack/cli/worker_manager'
-#require 'flapjack/cli/notifier_manager'
-#require 'flapjack/cli/notifier'
-#require 'flapjack/cli/worker'
-#require 'flapjack/persistence/couch'
-#require 'flapjack/persistence/sqlite3'
-#require 'flapjack/applications/notifier'
-#require 'flapjack/applications/worker'
-#require 'flapjack/notifiers/mailer/init'
-#require 'flapjack/notifiers/xmpp/init'
+class ProcessManagement
+  # Cleans up daemons that were started in a scenario.
+  # We kill these daemons so the test state is clean at the beginning of every
+  # scenario, and scenarios don't become coupled with one another.
+  def kill_lingering_daemons
+    # FIXME: iterate through a collection of daemons registered during the scenario
+    Process.kill("KILL", @beanstalk.pid) if @beanstalk
+  end
+
+  # Testing daemons with Ruby backticks blocks indefinitely, because the
+  # backtick method waits for the program to exit. We use the select() system
+  # call to read from a pipe connected to a daemon, and return if no data is
+  # read within the specified timeout.
+  #
+  # http://weblog.jamisbuck.org/assets/2006/9/25/gdb.rb
+  def read_until_timeout(pipe, timeout=1, verbose=false)
+    output = []
+    line    = ""
+    while data = IO.select([pipe], nil, nil, timeout) do
+      next if data.empty?
+      char = pipe.read(1)
+      break if char.nil?
+
+      line << char
+      if line[-1] == ?\n
+        puts line if verbose
+        output << line
+        line = ""
+      end
+    end
+
+    output
+  end
+
+end
+
+After do |scenario|
+  kill_lingering_daemons
+end
+
+World do
+  ProcessManagement.new
+end

data/flapjack.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{flapjack}
-  s.version = "0.5.4"
+  s.version = "0.5.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Lindsay Holmwood"]
-  s.date = %q{2011-01-14}
+  s.date = %q{2011-01-18}
   s.description = %q{lapjack is highly scalable and distributed monitoring system. It understands the Nagios plugin format, and can easily be scaled from 1 server to 1000.}
   s.email = %q{lindsay@holmwood.id.au}
   s.executables = ["flapjack-benchmark", "flapjack-netsaint-parser", "flapjack-notifier", "flapjack-notifier-manager", "flapjack-populator", "flapjack-stats", "flapjack-worker", "flapjack-worker-manager", "install-flapjack-systemwide"]
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
      "doc/PACKAGING.md",
      "features/flapjack-notifier-manager.feature",
      "features/flapjack-worker-manager.feature",
+     "features/flapjack-worker.feature",
      "features/netsaint-config-converter.feature",
      "features/packaging-lintian.feature",
      "features/persistence/couch.feature",
@@ -63,6 +64,7 @@ Gem::Specification.new do |s|
      "features/steps/flapjack-netsaint-parser_steps.rb",
      "features/steps/flapjack-notifier-manager_steps.rb",
      "features/steps/flapjack-worker-manager_steps.rb",
+     "features/steps/flapjack-worker_steps.rb",
      "features/steps/packaging-lintian_steps.rb",
      "features/support/env.rb",
      "features/support/silent_system.rb",

data/lib/flapjack/applications/worker.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/env ruby 
+#!/usr/bin/env ruby
 
 require 'log4r'
 require 'log4r/outputter/syslogoutputter'
@@ -7,8 +7,8 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'patches'))
 module Flapjack
   module Worker
     class Application
-     
-      # boots the notifier
+
+      # boots the worker
       def self.run(options={})
         app = self.new(options)
         app.setup_loggers
@@ -22,15 +22,28 @@ module Flapjack
 
       def initialize(options={})
         @log = options[:log]
-        @notifier_directories = options[:notifier_directories]
         @options = options
+
+        setup_event_handlers
+      end
+
+
+      def setup_event_handlers
+        at_exit do
+          @log.info("Shutting down")
+        end
+
+        trap("INT") do
+          puts "Caught shutdown signal, cleaning up."
+          exit
+        end
       end
 
       def setup_loggers
         unless @log
-	        @log = Log4r::Logger.new("notifier")
-	        @log.add(Log4r::StdoutOutputter.new("notifier"))
-	        @log.add(Log4r::SyslogOutputter.new("notifier"))
+          @log = Log4r::Logger.new("worker")
+          @log.add(Log4r::StdoutOutputter.new("worker"))
+          @log.add(Log4r::SyslogOutputter.new("worker"))
         end
       end
 
@@ -39,25 +52,26 @@ module Flapjack
       end
 
       def setup_queues
-        defaults = { :backend => :beanstalkd, 
-                     :host => 'localhost', 
+        defaults = { :backend => :beanstalkd,
+                     :host => 'localhost',
                      :port => '11300',
                      :log => @log }
         config = defaults.merge(@config.transport || {})
         basedir = config.delete(:basedir) || File.join(File.dirname(__FILE__), '..', 'transports')
 
         %w(results checks).each do |queue_name|
-          
+
           queue_config = config.merge(:queue_name => queue_name)
-       
+
           class_name = config[:backend].to_s.camel_case
-          filename = File.join(basedir, "#{config[:backend]}.rb")
-          
+          filename = File.expand_path(File.join(basedir, "#{config[:backend]}.rb"))
+
           @log.info("Loading the #{class_name} transport for queue: #{queue_name}.")
 
-          begin 
+          begin
             require filename
-            queue = Flapjack::Transport.const_get("#{class_name}").new(queue_config)
+            transport = Flapjack::Transport.const_get("#{class_name}")
+            queue     = transport.new(queue_config)
             instance_variable_set("@#{queue_name}_queue", queue)
           rescue LoadError => e
             @log.warning("Attempted to load #{class_name} transport, but it doesn't exist!")
@@ -67,6 +81,14 @@ module Flapjack
         end
       end
 
+      def log(level, opts={})
+        if opts[:data]
+          @log.method(level).call(pp opts[:data])
+        else
+          @log.method(level).call(opts[:message])
+        end
+      end
+
       def process_check
         @log.info("Waiting for check...")
         check = @checks_queue.next
@@ -89,7 +111,7 @@ module Flapjack
 
       def main
         @log.info("Booting main loop.")
-        loop do 
+        loop do
           process_check
         end
       end

data/lib/flapjack/transports/beanstalkd.rb

@@ -10,18 +10,35 @@ module Flapjack
       def initialize(options={})
         @options = options
         @config = OpenStruct.new(options)
+        @log    = @config.log
 
         unless @config.host && @config.port && @config.queue_name
           raise ArgumentError, "You need to specify a beanstalkd host, port, and queue name to connect to."
         end
 
-        @queue = Beanstalk::Pool.new(["#{@config.host}:#{@config.port}"], @config.queue_name)
+        connect
+      end
+
+      def connect
+        begin
+          @queue = Beanstalk::Pool.new(["#{@config.host}:#{@config.port}"], @config.queue_name)
+        rescue Beanstalk::NotConnected => e
+          @log.error("Couldn't connect to the '#{@config.queue_name}' Beanstalk queue. Waiting 5 seconds, then retrying.")
+          sleep 5
+          retry
+        end
       end
 
       def next
-        job = @queue.reserve # blocks
-        result = YAML::load(job.body)
-        Flapjack::Transport::Result.new(:job => job, :result => result)
+        begin
+          job = @queue.reserve # blocks
+          result = YAML::load(job.body)
+          Flapjack::Transport::Result.new(:job => job, :result => result)
+        rescue Beanstalk::NotConnected
+          @log.error("The '#{@config.queue_name}' Beanstalk queue went away. Waiting 5 seconds, then retrying.")
+          sleep 5
+          retry
+        end
       end
 
       def delete(result)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: flapjack
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
   - 5
-  - 4
-  version: 0.5.4
+  - 5
+  version: 0.5.5
 platform: ruby
 authors: 
 - Lindsay Holmwood
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-14 00:00:00 +11:00
+date: 2011-01-18 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -182,6 +182,7 @@ files:
 - doc/PACKAGING.md
 - features/flapjack-notifier-manager.feature
 - features/flapjack-worker-manager.feature
+- features/flapjack-worker.feature
 - features/netsaint-config-converter.feature
 - features/packaging-lintian.feature
 - features/persistence/couch.feature
@@ -193,6 +194,7 @@ files:
 - features/steps/flapjack-netsaint-parser_steps.rb
 - features/steps/flapjack-notifier-manager_steps.rb
 - features/steps/flapjack-worker-manager_steps.rb
+- features/steps/flapjack-worker_steps.rb
 - features/steps/packaging-lintian_steps.rb
 - features/support/env.rb
 - features/support/silent_system.rb