flapjack 0.6.54 → 0.6.55

data/bin/flapjack

@@ -82,6 +82,7 @@ when "start"
 
   if runner.daemon_running?
     puts "Flapjack is already running."
+    exit 1
   else
     print "Flapjack starting..."
     runner.execute(:daemonize => daemonize) {
@@ -100,6 +101,7 @@ when "stop"
     puts " done."
   else
     puts "Flapjack is not running."
+    exit 1
   end
 
 when "restart"
@@ -128,6 +130,7 @@ when "reload"
     end
   else
     puts "Flapjack is not running daemonized."
+    exit 1
   end
 
 when "status"
@@ -146,5 +149,6 @@ else
   else
     puts "Unknown command provided: '#{ARGV[0]}'"
   end
+  exit 1
 
 end

data/bin/flapjack-nagios-receiver

@@ -177,6 +177,7 @@ case ARGV[0]
 when "start"
   if runner.daemon_running?
     puts "#{exe} is already running."
+    exit 1
   else
     print "#{exe} starting..."
     runner.execute(:daemonize => daemonize) {
@@ -192,6 +193,7 @@ when "stop"
     puts " done."
   else
     puts "#{exe} is not running."
+    exit 1
   end
 
 when "restart"
@@ -215,6 +217,7 @@ else
   else
     puts "Unknown command provided: '#{ARGV[0]}'"
   end
+  exit 1
 
 end
 

data/bin/flapper

@@ -95,6 +95,7 @@ case ARGV[0]
 when "start"
   if runner.daemon_running?
     puts "#{exe} is already running."
+    exit 1
   else
     print "#{exe} starting..."
     runner.execute(:daemonize => daemonize) {
@@ -110,6 +111,7 @@ when "stop"
     puts " done."
   else
     puts "#{exe} is not running."
+    exit 1
   end
 
 when "restart"
@@ -133,5 +135,6 @@ else
   else
     puts "Unknown command provided: '#{ARGV[0]}'"
   end
+  exit 1
 
 end

data/dist/etc/init.d/flapjack

@@ -28,15 +28,20 @@ fi
 case "$1" in
   start)
     rbenv shell 1.9.3-p125
-    flapjack --config /etc/flapjack/flapjack-config.yaml --daemonize
+    flapjack start --config /etc/flapjack/flapjack-config.yaml --daemonize
     RETVAL=$?
   ;;
   stop)
-    kill `cat /var/run/flapjack/flapjack.pid`
-    # FIXME: make this more robust, preferably use daemons foo
-    # or at least wait until the flapjack process has exited before exiting
+    flapjack stop --config /etc/flapjack/flapjack-config.yaml
     RETVAL=$?
   ;;
+  restart)
+    flapjack restart --config /etc/flapjack/flapjack-config.yaml
+    RETVAL=$?
+  ;;
+  reload)
+    flapjack reload --config /etc/flapjack/flapjack-config.yaml
+    RETVAL=$?
   *)
     echo "Usage: flapjack {start|stop}"
     RETVAL=1

data/dist/etc/init.d/flapjack-nagios-receiver

@@ -20,15 +20,15 @@ export FLAPJACK_ENV="production"
 
 NAGIOS_PERFDATA_FIFO="/var/cache/nagios3/event_stream.fifo"
 
-if [ ! $(which flapjack-nagios-receiver-control) ]; then
-  echo "Error: flapjack-nagios-receiver-control isn't in PATH."
+if [ ! $(which flapjack-nagios-receiver) ]; then
+  echo "Error: flapjack-nagios-receiver isn't in PATH."
   echo "Refusing to do anything!"
   exit 1
 fi
 
 # Evaluate command
 
-rbenv shell 1.9.3-p125 && flapjack-nagios-receiver-control $1 -- --config /etc/flapjack/flapjack-config.yaml --fifo ${NAGIOS_PERFDATA_FIFO}
+rbenv shell 1.9.3-p125 && flapjack-nagios-receiver $1 --config /etc/flapjack/flapjack-config.yaml --fifo ${NAGIOS_PERFDATA_FIFO}
 
 RETVAL=$?
 exit $RETVAL

data/dist/etc/init.d/flapper

@@ -13,15 +13,14 @@ fi
 # Default return value
 RETVAL=0
 
-if [ ! $(which flapper-control) ]; then
-  echo "Error: flapper-control isn't in PATH."
+if [ ! $(which flapper) ]; then
+  echo "Error: flapper isn't in PATH."
   echo "Refusing to do anything!"
   exit 1
 fi
 
 # Evaluate command
-
-rbenv shell 1.9.3-p125 && flapper-control $1
+rbenv shell 1.9.3-p125 && flapper $1
 RETVAL=$?
 
 exit $RETVAL

data/lib/flapjack/version.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  VERSION = "0.6.54"
+  VERSION = "0.6.55"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flapjack
 version: !ruby/object:Gem::Version
-  version: 0.6.54
+  version: 0.6.55
   prerelease: 
 platform: ruby
 authors:
@@ -330,10 +330,6 @@ files:
 - bin/flapjack-populator
 - bin/flapper
 - config.ru
-- dist/etc/default/flapjack-notifier
-- dist/etc/default/flapjack-workers
-- dist/etc/flapjack/flapjack-notifier.conf.example
-- dist/etc/flapjack/recipients.conf.example
 - dist/etc/init.d/flapjack
 - dist/etc/init.d/flapjack-nagios-receiver
 - dist/etc/init.d/flapper
@@ -469,7 +465,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3074875956567986285
+      hash: -1136373001526107045
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -478,7 +474,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3074875956567986285
+      hash: -1136373001526107045
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/dist/etc/default/flapjack-notifier

@@ -1,15 +0,0 @@
-# Defaults for flapjack-notifier initscript
-# sourced by /etc/init.d/flapjack-notifier
-
-# set enabled to 1 if you want the init script to start flapjack-notifier
-ENABLED=1
-
-# recipients file
-RECIPIENTS=/etc/flapjack/recipients.yaml
-
-# address beanstalkd is bound to
-BEANSTALKD_ADDR=localhost
-
-# port beanstalk is listening on
-BEANSTALKD_PORT=11300
-

data/dist/etc/default/flapjack-workers

@@ -1,17 +0,0 @@
-# Defaults for flapjack-workers initscript
-# sourced by /etc/init.d/flapjack-workers
-
-# set enabled to 1 if you want the init script to start flapjack-workers
-ENABLED=1
-
-# address beanstalkd is bound to
-BEANSTALKD_ADDR=localhost
-
-# port beanstalk is listening on
-BEANSTALKD_PORT=11300
-
-# number of workers to spin up
-WORKERS=5
-
-# location of the checks
-CHECKS_DIRECTORY=/usr/lib/flapjack/checks

data/dist/etc/flapjack/flapjack-notifier.conf.example

@@ -1,34 +0,0 @@
-# top level
-[notifier]
-  notifier-directories = /usr/lib/flapjack/notifiers/ /path/to/my/notifiers
-  notifiers = mailer, xmpp
-
-# persistence layers
-[persistence]
-  backend = data_mapper
-  uri = sqlite3:///tmp/flapjack.db
-
-# couchdb backend
-#[persistence]
-#  backend = couchdb
-#  version = 0.8
-#  host = localhost
-#  port = 5984 
-#  database = flapjack_production
-  
-# message transports
-[transport]
-  backend = beanstalkd
-  host = localhost
-  port = 11300
-
-# notifiers
-[mailer-notifier]
-  from_address = foo@bar.com
-
-[xmpp-notifier]
-  jid = foo@bar.com
-  password = barfoo
-  
-
-

data/dist/etc/flapjack/recipients.conf.example

@@ -1,14 +0,0 @@
-# example recipients.conf
-
-[John Doe]
-  email = johndoe@example.org
-  jid = john@example.org
-  phone = +61 400 111 222
-  pager = 61400111222
-
-[Jane Doe]
-  email = janedoe@example.org
-  jid = jane@example.org
-  phone = +61 222 333 111
-  pager = 61222333111
-