flapjack 1.0.0rc3 → 1.0.0rc5

data/lib/flapjack/cli/flapper.rb

@@ -23,14 +23,40 @@ module Flapjack
       def initialize(global_options, options)
         @global_options = global_options
         @options = options
+
+        @config = Flapjack::Configuration.new
+        @config.load(global_options[:config])
+        @config_env = @config.all
+
+        if @config_env.nil? || @config_env.empty?
+          exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'"
+        end
+
+        @pidfile = case
+        when !@options[:pidfile].nil?
+          @options[:pidfile]
+        when !@config_env['pid_dir'].nil?
+          @config_env['pid_dir'] + 'flapper.pid'
+        else
+          "/var/run/flapjack/flapper.pid"
+        end
+
+        @logfile = case
+        when !@options[:logfile].nil?
+          @options[:logfile]
+        when !@config_env['log_dir'].nil?
+          @config_env['log_dir'] + 'flapper.log'
+        else
+          "/var/run/flapjack/flapper.log"
+        end
       end
 
       def start
         if runner.daemon_running?
           puts "flapper is already running."
-          exit 1
         else
           print "flapper starting..."
+          print "\n" unless @options[:daemonize]
           runner.execute(:daemonize => @options[:daemonize]) do
             main(@options['bind-ip'], @options['bind-port'].to_i, @options[:frequency])
           end
@@ -39,14 +65,15 @@ module Flapjack
       end
 
       def stop
+        pid = get_pid
         if runner.daemon_running?
           print "flapper stopping..."
           runner.execute(:kill => true)
           puts " done."
         else
           puts "flapper is not running."
-          exit 1
         end
+        exit_now! unless wait_pid_gone(pid)
       end
 
       def restart
@@ -58,12 +85,12 @@ module Flapjack
       end
 
       def status
-        uptime = (runner.daemon_running?) ? (Time.now - File.stat(@options[:pidfile]).ctime) : 0
         if runner.daemon_running?
-          puts "flapper is running: #{uptime}"
+          pid = get_pid
+          uptime = Time.now - File.stat(@pidfile).ctime
+          puts "flapper is running: pid #{pid}, uptime #{uptime}"
         else
-          puts "flapper is not running"
-          exit 3
+          exit_now! "flapper is not running"
         end
       end
 
@@ -79,8 +106,8 @@ module Flapjack
       def runner
         return @runner if @runner
 
-        @runner = Dante::Runner.new('flapper', :pid_path => @options[:pidfile],
-          :log_path => @options[:logfile])
+        @runner = Dante::Runner.new('flapper', :pid_path => @pidfile,
+          :log_path => @logfile)
         @runner
       end
 
@@ -109,12 +136,42 @@ module Flapjack
         end
       end
 
+      def process_exists(pid)
+        return unless pid
+        begin
+          Process.kill(0, pid)
+          return true
+        rescue Errno::ESRCH
+          return false
+        end
+      end
+
+      # wait until the specified pid no longer exists, or until a timeout is reached
+      def wait_pid_gone(pid, timeout = 30)
+        print "waiting for a max of #{timeout} seconds for process #{pid} to exit" if process_exists(pid)
+        started_at = Time.now.to_i
+        while process_exists(pid)
+          break unless (Time.now.to_i - started_at < timeout)
+          print '.'
+          sleep 1
+        end
+        puts ''
+        !process_exists(pid)
+      end
+
+      def get_pid
+        IO.read(@pidfile).chomp.to_i
+      rescue StandardError
+        pid = nil
+      end
+
+
     end
   end
 end
 
 
-desc 'Artificial service that oscillates up and down'
+desc 'Artificial service that oscillates up and down, for use in http://flapjack.io/docs/1.0/usage/oobetet'
 command :flapper do |flapper|
 
   flapper.desc 'start flapper'
@@ -123,11 +180,9 @@ command :flapper do |flapper|
     start.switch [:d, 'daemonize'], :desc => 'Daemonize',
       :default_value => true
 
-    start.flag   [:p, 'pidfile'],   :desc => 'PATH of the pidfile to write to',
-      :default_value =>  "/var/run/flapjack/flapper.pid"
+    start.flag   [:p, 'pidfile'],   :desc => 'PATH of the pidfile to write to'
 
-    start.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to',
-      :default_value =>  "/var/log/flapjack/flapper.log"
+    start.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to'
 
     start.flag   [:b, 'bind-ip'],   :desc => 'ADDRESS (IPv4 or IPv6) for flapper to bind to',
       :default_value => Flapjack::CLI::Flapper.local_ip
@@ -147,11 +202,9 @@ command :flapper do |flapper|
   flapper.desc 'stop flapper'
   flapper.command :stop do |stop|
 
-    stop.flag   [:p, 'pidfile'],   :desc => 'PATH of the pidfile to write to',
-      :default_value =>  "/var/run/flapjack/flapper.pid"
+    stop.flag   [:p, 'pidfile'],   :desc => 'PATH of the pidfile to write to'
 
-    stop.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to',
-      :default_value =>  "/var/log/flapjack/flapper.log"
+    stop.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to'
 
     stop.action do |global_options, options, args|
       cli_flapper = Flapjack::CLI::Flapper.new(global_options, options)
@@ -162,11 +215,9 @@ command :flapper do |flapper|
   flapper.desc 'restart flapper'
   flapper.command :restart do |restart|
 
-    restart.flag   [:p, 'pidfile'],   :desc => 'PATH of the pidfile to write to',
-      :default_value =>  "/var/run/flapjack/flapper.pid"
+    restart.flag   [:p, 'pidfile'],   :desc => 'PATH of the pidfile to write to'
 
-    restart.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to',
-      :default_value =>  "/var/log/flapjack/flapper.log"
+    restart.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to'
 
     restart.flag   [:b, 'bind-ip'],   :desc => 'ADDRESS (IPv4 or IPv6) for flapper to bind to',
       :default_value => Flapjack::CLI::Flapper.local_ip
@@ -186,11 +237,9 @@ command :flapper do |flapper|
   flapper.desc 'flapper status'
   flapper.command :status do |status|
 
-    status.flag   [:p, 'pidfile'],   :desc => 'PATH of the pidfile to write to',
-      :default_value =>  "/var/run/flapjack/flapper.pid"
+    status.flag   [:p, 'pidfile'],   :desc => 'PATH of the pidfile to write to'
 
-    status.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to',
-      :default_value =>  "/var/log/flapjack/flapper.log"
+    status.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to'
 
     status.action do |global_options, options, args|
       cli_flapper = Flapjack::CLI::Flapper.new(global_options, options)

data/lib/flapjack/cli/import.rb

@@ -22,8 +22,7 @@ module Flapjack
         @config_env = config.all
 
         if @config_env.nil? || @config_env.empty?
-          puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'"
-          exit 1
+          exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'"
         end
 
         @redis_options = config.for_redis
@@ -65,14 +64,14 @@ module Flapjack
       private
 
       def redis
-        @redis ||= Redis.new(@redis_options)
+        @redis ||= Redis.new(@redis_options.merge(:driver => :ruby))
       end
 
     end
   end
 end
 
-desc 'Bulk import data from an external source'
+desc 'Bulk import data from an external source, reading from JSON formatted data files'
 command :import do |import|
 
   import.desc 'Import contacts'

data/lib/flapjack/cli/maintenance.rb

@@ -0,0 +1,182 @@
+#!/usr/bin/env ruby
+
+require 'eventmachine'
+require 'em-synchrony'
+require 'redis'
+require 'redis/connection/synchrony'
+
+require 'flapjack/configuration'
+require 'flapjack/data/event'
+require 'flapjack/data/entity_check'
+require 'terminal-table'
+
+module Flapjack
+  module CLI
+    class Maintenance
+
+      def initialize(global_options, options)
+        @global_options = global_options
+        @options = options
+
+        config = Flapjack::Configuration.new
+        config.load(global_options[:config])
+        @config_env = config.all
+
+        if @config_env.nil? || @config_env.empty?
+          exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'"
+        end
+
+        @redis_options = config.for_redis.merge(:driver => :ruby)
+        @options[:redis] = redis
+      end
+
+      def show
+        exit_now!("state must be one of 'ok', 'warning', 'critical', 'unknown'") unless @options[:state].nil? || %w(ok warning critical unknown).include?(@options[:state].downcase)
+        exit_now!("type must be one of 'scheduled', 'unscheduled'") unless %w(scheduled unscheduled).include?(@options[:type].downcase)
+        %w(started finishing).each do |time|
+          exit_now!("#{time.capitalize} time must start with 'more than', 'less than', 'on', 'before', 'after' or between") if @options[time] && !@options[time].downcase.start_with?('more than', 'less than', 'on', 'before', 'after', 'between')
+        end
+        @options[:finishing] ||= 'after now'
+        maintenances = Flapjack::Data::EntityCheck.find_maintenance(@options)
+        rows = []
+        maintenances.each do |m|
+          row = []
+          # Convert the unix timestamps of the start and end time back into readable times
+          m.each { |k, v| row.push(k.to_s.end_with?('time') ? Time.at(v) : v) }
+          rows.push(row)
+        end
+        puts Terminal::Table.new :headings => ['Entity', 'Check', 'State', 'Start', 'Duration (s)', 'Reason', 'End'], :rows => rows
+        maintenances
+      end
+
+      def delete
+        maintenances = show
+        exit_now!('The following maintenances would be deleted.  Run this command again with --apply true to remove them.') unless @options[:apply]
+        errors = Flapjack::Data::EntityCheck.delete_maintenance(@options)
+        (errors.each { |k, v| puts "#{k}: #{v}" }; exit_now!('Failed to delete maintenances')) if errors.length > 0
+        puts "The maintenances above have been deleted"
+      end
+
+      def create
+        exit_now!("Entity & check must be supplied to create a maintenance period") if @options[:entity].nil? || @options[:check].nil?
+        errors = Flapjack::Data::EntityCheck.create_maintenance(@options)
+        (errors.each { |k, v| puts "#{k}: #{v}" }; exit_now!('Failed to create maintenances')) if errors.length > 0
+        puts "The maintenances specified have been created"
+      end
+
+      private
+
+      def redis
+        @redis ||= Redis.new(@redis_options)
+      end
+
+    end
+  end
+end
+
+desc 'Show, create and delete maintenance windows'
+command :maintenance do |maintenance|
+
+
+  maintenance.desc 'Show maintenance windows according to criteria (default: all ongoing maintenance)'
+  maintenance.command :show do |show|
+
+    show.flag [:e, 'entity'],
+      :desc => 'The entity for the maintenance window to occur on.  This can be a string, or a ruby regex of the form \'db*\' or \'[[:lower:]]\''
+
+    show.flag [:c, 'check'],
+      :desc => 'The check for the maintenance window to occur on.  This can be a string, or a ruby regex of the form \'http*\' or \'[[:lower:]]\''
+
+    show.flag [:r, 'reason'],
+      :desc => 'The reason for the maintenance window to occur.  This can be a string, or a ruby regex of the form \'Downtime for *\' or \'[[:lower:]]\''
+
+    show.flag [:s, 'start', 'started', 'starting'],
+      :desc => 'The start time for the maintenance window. This should be prefixed with "more than", "less than", "on", "before", or "after", or of the form "between times and time"'
+
+    show.flag [:d, 'duration'],
+      :desc => 'The total duration of the maintenance window. This should be prefixed with "more than", "less than", "before, "after" or "equal to", or or of the form "between 3 and 4 hours".  This should be an interval'
+
+    show.flag [:f, 'finish', 'finished', 'finishing', 'remain', 'remained', 'remaining', 'end'],
+      :desc => 'The finishing time for the maintenance window. This should be prefixed with "more than", "less than", "on", "before", or "after", or of the form "between time and time"'
+
+    show.flag [:st, 'state'],
+      :desc => 'The state that the check is currently in'
+
+    show.flag [:t, 'type'],
+      :desc => 'The type of maintenance scheduled',
+      :default_value => 'scheduled'
+
+    show.action do |global_options,options,args|
+      maintenance = Flapjack::CLI::Maintenance.new(global_options, options)
+      maintenance.show
+    end
+  end
+
+  maintenance.desc 'Delete maintenance windows according to criteria (default: all ongoing maintenance)'
+  maintenance.command :delete do |delete|
+
+    delete.flag [:a, 'apply'],
+      :desc => 'Whether this deletion should occur',
+      :default_value => false
+
+    delete.flag [:e, 'entity'],
+      :desc => 'The entity for the maintenance window to occur on.  This can be a string, or a ruby regex of the form \'db*\' or \'[[:lower:]]\''
+
+    delete.flag [:c, 'check'],
+      :desc => 'The check for the maintenance window to occur on.  This can be a string, or a ruby regex of the form \'http*\' or \'[[:lower:]]\''
+
+    delete.flag [:r, 'reason'],
+      :desc => 'The reason for the maintenance window to occur.  This can be a string, or a ruby regex of the form \'Downtime for *\' or \'[[:lower:]]\''
+
+    delete.flag [:s, 'start', 'started', 'starting'],
+      :desc => 'The start time for the maintenance window. This should be prefixed with "more than", "less than", "on", "before", or "after", or of the form "between times and time"'
+
+    delete.flag [:d, 'duration'],
+      :desc => 'The total duration of the maintenance window. This should be prefixed with "more than", "less than", "before, "after" or "equal to", or or of the form "between 3 and 4 hours".  This should be an interval'
+
+    delete.flag [:f, 'finish', 'finished', 'finishing', 'remain', 'remained', 'remaining', 'end'],
+      :desc => 'The finishing time for the maintenance window. This should be prefixed with "more than", "less than", "on", "before", or "after", or of the form "between time and time"'
+
+    delete.flag [:st, 'state'],
+      :desc => 'The state that the check is currently in'
+
+    delete.flag [:t, 'type'],
+      :desc => 'The type of maintenance scheduled',
+      :default_value => 'scheduled'
+
+    delete.action do |global_options,options,args|
+      maintenance = Flapjack::CLI::Maintenance.new(global_options, options)
+      maintenance.delete
+    end
+  end
+
+  maintenance.desc 'Create a maintenance window'
+  maintenance.command :create do |create|
+
+    create.flag [:e, 'entity'],
+      :desc => 'The entity for the maintenance window to occur on.  This can be a comma separated list',
+      :type => Array
+
+    create.flag [:c, 'check'],
+      :desc => 'The check for the maintenance window to occur on.  This can be a comma separated list',
+      :type => Array
+
+    create.flag [:r, 'reason'],
+      :desc => 'The reason for the maintenance window to occur'
+
+    create.flag [:s, 'start', 'started', 'starting'],
+      :desc => 'The start time for the maintenance window'
+
+    create.flag [:d, 'duration'],
+      :desc => 'The total duration of the maintenance window.  This should be an interval'
+
+    create.flag [:t, 'type'],
+      :desc => 'The type of maintenance scheduled ("scheduled")',
+      :default_value => 'scheduled'
+
+    create.action do |global_options,options,args|
+      maintenance = Flapjack::CLI::Maintenance.new(global_options, options)
+      maintenance.create
+    end
+  end
+end

data/lib/flapjack/cli/receiver.rb

@@ -20,123 +20,87 @@ module Flapjack
         @global_options = global_options
         @options = options
 
-        config = Flapjack::Configuration.new
-        config.load(global_options[:config])
-        @config_env = config.all
+        @config = Flapjack::Configuration.new
+        @config.load(global_options[:config])
+        @config_env = @config.all
 
         if @config_env.nil? || @config_env.empty?
-          puts "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'"
-          exit 1
+          exit_now! "No config data for environment '#{FLAPJACK_ENV}' found in '#{global_options[:config]}'"
         end
 
-        @redis_options = config.for_redis
-      end
+        @config_runner = @config_env["#{@options[:type]}-receiver"] || {}
 
-      # For nagios-receiver:
-      #
-      # nagios.cfg must contain the following perfdata templates for host and service data (modified from the default
-      # to include hoststate / servicestate, and a fake service 'HOST' for hostperfdata, so that the
-      # fields match up:
-      #
-      #   host_perfdata_file_template=[HOSTPERFDATA]\t$TIMET$\t$HOSTNAME$\tHOST\t$HOSTSTATE$\t$HOSTEXECUTIONTIME$\t$HOSTLATENCY$\t$HOSTOUTPUT$\t$HOSTPERFDATA$
-      #
-      #   service_perfdata_file_template=[SERVICEPERFDATA]\t$TIMET$\t$HOSTNAME$\t$SERVICEDESC$\t$SERVICESTATE$\t$SERVICEEXECUTIONTIME$\t$SERVICELATENCY$\t$SERVICEOUTPUT$\t$SERVICEPERFDATA$
-      #
-
-      def nagios_start
-        if runner('nagios').daemon_running?
-          puts "nagios-receiver is already running."
-          exit 1
+        @pidfile = case
+        when !@options[:pidfile].nil?
+          @options[:pidfile]
+        when !@config_env['pid_dir'].nil?
+          @config_env['pid_dir'] + "#{@options[:type]}-receiver.pid"
         else
-          print "nagios-receiver starting..."
-          runner('nagios').execute(:daemonize => @options[:daemonize]) do
-            begin
-              main(:fifo => @options[:fifo], :nagios => true)
-            rescue Exception => e
-              p e.message
-              puts e.backtrace.join("\n")
-            end
-          end
-          puts " done."
+          "/var/run/flapjack/#{@options[:type]}-receiver.pid"
         end
-      end
 
-      def nagios_stop
-        if runner('nagios').daemon_running?
-          print "nagios-receiver stopping..."
-          runner('nagios').execute(:kill => true)
-          puts " done."
+        @logfile = case
+        when !@options[:logfile].nil?
+          @options[:logfile]
+        when !@config_env['log_dir'].nil?
+          @config_env['log_dir'] + "#{@options[:type]}-receiver.log"
         else
-          puts "nagios-receiver is not running."
-          exit 1
+          "/var/run/flapjack/#{@options[:type]}-receiver.log"
         end
-      end
 
-      def nagios_restart
-        print "nagios-receiver restarting..."
-        runner('nagios').execute(:daemonize => true, :restart => true) do
-          main(:fifo => @options[:fifo], :nagios => true)
-        end
-        puts " done."
+        @redis_options = @config.for_redis
       end
 
-      def nagios_status
-        config_runner = @config_env["nagios-receiver"] || {}
-        pidfile = @options[:pidfile] || config_runner['pid_file'] ||
-          "/var/run/flapjack/nagios-receiver.pid"
-        uptime = (runner('nagios').daemon_running?) ? (Time.now - File.stat(pidfile).ctime) : 0
-        if runner('nagios').daemon_running?
-          puts "nagios-receiver is running: #{uptime}"
+      def start
+        if runner(@options[:type]).daemon_running?
+          puts "#{@options[:type]}-receiver is already running."
         else
-          puts "nagios-receiver is not running"
-          exit 3
-        end
-      end
-
-      def nsca_start
-        if runner('nsca').daemon_running?
-          puts "nsca-receiver is already running."
-          exit 1
-        else
-          print "nsca-receiver starting..."
-          runner('nsca').execute(:daemonize => @options[:daemonize]) do
-            main(:fifo => @options[:fifo], :nsca => true)
+          print "#{@options[:type]}-receiver starting..."
+          print "\n" unless @options[:daemonize]
+          runner(@options[:type]).execute(:daemonize => @options[:daemonize]) do
+            begin
+              main(:fifo => @options[:fifo], :type => @options[:type])
+            rescue Exception => e
+              p e.message
+              puts e.backtrace.join("\n")
+            end
           end
           puts " done."
         end
       end
 
-      def nsca_stop
-        if runner('nsca').daemon_running?
-          print "nsca-receiver stopping..."
-          runner('nsca').execute(:kill => true)
+      def stop
+        pid = get_pid
+        if runner(@options[:type]).daemon_running?
+          print "#{@options[:type]}-receiver stopping..."
+          runner(@options[:type]).execute(:kill => true)
           puts " done."
         else
-          puts "nsca-receiver is not running."
-          exit 1
+          puts "#{@options[:type]}-receiver is not running."
         end
+        exit_now! unless wait_pid_gone(pid)
       end
 
-      def nsca_restart
-        print "nsca-receiver restarting..."
-        runner('nsca').execute(:daemonize => true, :restart => true) do
-          main(:fifo => @options[:fifo], :nsca => true)
+      def restart
+        print "#{@options[:type]}-receiver restarting..."
+        runner(@options[:type]).execute(:daemonize => true, :restart => true) do
+          begin
+            main(:fifo => @options[:fifo], :type => @options[:type])
+          rescue Exception => e
+            p e.message
+            puts e.backtrace.join("\n")
+          end
         end
         puts " done."
       end
 
-      def nsca_status
-        config_runner = @config_env["nsca-receiver"] || {}
-
-        pidfile = @options[:pidfile] || config_runner['pid_file'] ||
-          "/var/run/flapjack/nsca-receiver.pid"
-
-        uptime = (runner('nsca').daemon_running?) ? (Time.now - File.stat(pidfile).ctime) : 0
-        if runner('nsca').daemon_running?
-          puts "nsca-receiver is running: #{uptime}"
+      def status
+        if runner(@options[:type]).daemon_running?
+          pid = get_pid
+          uptime = Time.now - File.stat(@pidfile).ctime
+          puts "#{@options[:type]}-receiver is running: pid #{pid}, uptime #{uptime}"
         else
-          puts "nsca-receiver is not running"
-          exit 3
+          exit_now! "#{@options[:type]}-receiver is not running"
         end
       end
 
@@ -159,25 +123,16 @@ module Flapjack
       def runner(type)
         return @runner if @runner
 
-        config_runner = @config_env["#{type}-receiver"] || {}
-
-        pidfile = @options[:pidfile].nil? ?
-                    (config_runner['pid_file'] || "/var/run/flapjack/#{type}-receiver.pid") :
-                    @options[:pidfile]
-
-        logfile = @options[:logfile].nil? ?
-                    (config_runner['log_file'] || "/var/log/flapjack/#{type}-receiver.log") :
-                    @options[:logfile]
-
-        @runner = Dante::Runner.new("#{type}-receiver", :pid_path => pidfile,
-          :log_path => logfile)
+        @runner = Dante::Runner.new("#{@options[:type]}-receiver", :pid_path => @pidfile,
+          :log_path => @logfile)
         @runner
       end
 
       def process_input(opts)
-        config_rec = if opts[:nagios]
+        config_rec = case opts[:type]
+        when /nagios/
           @config_env['nagios-receiver'] || {}
-        elsif opts[:nsca]
+        when /nsca/
           @config_env['nsca-receiver'] || {}
         else
           raise "Unknown receiver type"
@@ -204,8 +159,8 @@ module Flapjack
               check_latency, check_output, check_perfdata, check_long_output =
                [nil] * 10
 
-            if opts[:nagios]
-
+            case opts[:type]
+            when /nagios/
               object_type, timestamp, entity, check, state, check_time,
                 check_latency, check_output, check_perfdata, check_long_output = split_line
 
@@ -221,7 +176,7 @@ module Flapjack
                 next
               end
 
-            elsif opts[:nsca]
+            when /nsca/
 
               timestamp, passivecheck = split_line
               split_passive = passivecheck.split(";")
@@ -269,12 +224,40 @@ module Flapjack
       def main(opts)
         fifo = opts[:fifo]
         while true
-          process_input(:fifo => fifo, :nagios => opts[:nagios], :nsca => opts[:nsca])
+          process_input(:fifo => fifo, :type => opts[:type])
           puts "Whoops with the fifo, restarting main loop in 10 seconds"
           sleep 10
         end
       end
 
+      def process_exists(pid)
+        return unless pid
+        begin
+          Process.kill(0, pid)
+          return true
+        rescue Errno::ESRCH
+          return false
+        end
+      end
+
+      # wait until the specified pid no longer exists, or until a timeout is reached
+      def wait_pid_gone(pid, timeout = 30)
+        print "waiting for a max of #{timeout} seconds for process #{pid} to exit" if process_exists(pid)
+        started_at = Time.now.to_i
+        while process_exists(pid)
+          break unless (Time.now.to_i - started_at < timeout)
+          print '.'
+          sleep 1
+        end
+        puts ''
+        !process_exists(pid)
+      end
+
+      def get_pid
+        IO.read(@pidfile).chomp.to_i
+      rescue StandardError
+        pid = nil
+      end
 
       class EventFeedHandler < Oj::ScHandler
 
@@ -319,8 +302,7 @@ module Flapjack
         input = if opts[:from]
           File.open(opts[:from]) # Explodes if file does not exist.
         elsif $stdin.tty?
-          puts "No file provided, and STDIN is from terminal! Exiting..."
-          exit(1)
+          exit_now! "No file provided, and STDIN is from terminal! Exiting..."
         else
           $stdin
         end
@@ -349,8 +331,7 @@ module Flapjack
 
       def mirror_receive(opts)
         unless opts[:follow] || opts[:all]
-          puts "one or both of --follow or --all is required"
-          exit 1
+          exit_now! "one or both of --follow or --all is required"
         end
 
         source_redis = Redis.new(:url => opts[:source])
@@ -422,7 +403,7 @@ module Flapjack
   end
 end
 
-desc 'Receive events from external systems and send them to Flapjack'
+desc 'Receive events from external systems and sends them to Flapjack'
 arg_name 'receiver'
 command :receiver do |receiver|
 
@@ -453,7 +434,7 @@ command :receiver do |receiver|
     #   host_perfdata_file_mode=p
     #   service_perfdata_file_mode=p
 
-    # Details on the wiki: https://github.com/flapjack/flapjack/wiki/USING#configuring-nagios
+    # Details on the wiki: http://flapjack.io/docs/1.0/usage/USING#configuring-nagios
     # '
 
     nagios.command :start do |start|
@@ -468,8 +449,9 @@ command :receiver do |receiver|
       start.flag   [:f, 'fifo'],      :desc => 'PATH of the nagios perfdata named pipe'
 
       start.action do |global_options,options,args|
+        options.merge!(:type => 'nagios')
         receiver = Flapjack::CLI::Receiver.new(global_options, options)
-        receiver.nagios_start
+        receiver.start
       end
     end
 
@@ -480,8 +462,9 @@ command :receiver do |receiver|
       stop.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to'
 
       stop.action do |global_options,options,args|
+        options.merge!(:type => 'nagios')
         receiver = Flapjack::CLI::Receiver.new(global_options, options)
-        receiver.nagios_stop
+        receiver.stop
       end
     end
 
@@ -494,8 +477,9 @@ command :receiver do |receiver|
       restart.flag   [:f, 'fifo'],      :desc => 'PATH of the nagios perfdata named pipe'
 
       restart.action do |global_options,options,args|
+        options.merge!(:type => 'nagios')
         receiver = Flapjack::CLI::Receiver.new(global_options, options)
-        receiver.nagios_restart
+        receiver.restart
       end
     end
 
@@ -506,8 +490,9 @@ command :receiver do |receiver|
       status.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to'
 
       status.action do |global_options,options,args|
+        options.merge!(:type => 'nagios')
         receiver = Flapjack::CLI::Receiver.new(global_options, options)
-        receiver.nagios_status
+        receiver.status
       end
     end
 
@@ -535,7 +520,7 @@ command :receiver do |receiver|
       # The Nsca daemon is optionally writing to a tempfile if the named pipe does
       # not exist.
 
-      # Details on the wiki: https://github.com/flapjack/flapjack/wiki/USING#XXX
+      # Details on the wiki: http://flapjack.io/docs/1.0/usage/USING#XXX
       # '
 
       start.switch [:d, 'daemonize'], :desc => 'Daemonize',
@@ -548,8 +533,9 @@ command :receiver do |receiver|
       start.flag   [:f, 'fifo'],      :desc => 'PATH of the nagios perfdata named pipe'
 
       start.action do |global_options,options,args|
+        options.merge!(:type => 'nsca')
         receiver = Flapjack::CLI::Receiver.new(global_options, options)
-        receiver.nsca_start
+        receiver.start
       end
     end
 
@@ -560,8 +546,9 @@ command :receiver do |receiver|
       stop.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to'
 
       stop.action do |global_options,options,args|
+        options.merge!(:type => 'nsca')
         receiver = Flapjack::CLI::Receiver.new(global_options, options)
-        receiver.nsca_stop
+        receiver.stop
       end
     end
 
@@ -574,8 +561,9 @@ command :receiver do |receiver|
       restart.flag   [:f, 'fifo'],      :desc => 'PATH of the nagios perfdata named pipe'
 
       restart.action do |global_options,options,args|
+        options.merge!(:type => 'nsca')
         receiver = Flapjack::CLI::Receiver.new(global_options, options)
-        receiver.nsca_restart
+        receiver.restart
       end
     end
 
@@ -586,8 +574,9 @@ command :receiver do |receiver|
       status.flag   [:l, 'logfile'],   :desc => 'PATH of the logfile to write to'
 
       status.action do |global_options,options,args|
+        options.merge!(:type => 'nsca')
         receiver = Flapjack::CLI::Receiver.new(global_options, options)
-        receiver.nsca_status
+        receiver.status
       end
     end