auxesis-flapjack 0.4.6 → 0.4.8

data/bin/flapjack-notifier-manager

@@ -16,8 +16,16 @@ options = Flapjack::NotifierManagerOptions.parse(args)
 worker_path = File.join(File.dirname(__FILE__), 'flapjack-notifier')
 
 # set up pid dir
-pid_dir = "/var/run/flapjack"
-FileUtils.mkdir_p(pid_dir)
+pid_dir = "/var/run/flapjack/"
+unless File.exists?(pid_dir)
+  puts "#{pid_dir} doesn't exist."
+  exit 2
+end
+
+unless File.writable?(pid_dir)
+  puts "Can't write to #{pid_dir} - check permissions?"
+  exit 2
+end
 
 daemon_args = (args + ['--', '--beanstalk', options.host, 
                        '--port', options.port.to_s,

data/flapjack.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'flapjack'
-  s.version = '0.4.6'
+  s.version = '0.4.8'
   s.date = '2009-07-14'
   
   s.summary = "a scalable and distributed monitoring system"

data/lib/flapjack/cli/notifier_manager.rb

@@ -41,15 +41,17 @@ module Flapjack
       options.host ||= "localhost"
       options.port ||= 11300
 
-      unless options.recipients =~ /.+/
-        puts "You must specify a recipients file!\n\n"
-        puts opts
-        exit 2
-      end
-  
-      unless File.exists?(options.recipients)
-        puts "The specified recipients file doesn't exist!"
-        exit 2
+      unless ARGV[0] == "stop"
+        unless options.recipients =~ /.+/ 
+          puts "You must specify a recipients file!\n\n"
+          puts opts
+          exit 2
+        end
+    
+        unless File.exists?(options.recipients)
+          puts "The specified recipients file doesn't exist!"
+          exit 2
+        end
       end
   
       unless %w(start stop restart).include?(args[0])

data/lib/flapjack/notifiers/mailer/mailer.rb

@@ -11,7 +11,7 @@ module Flapjack
 
       def initialize(opts={})
         @from_address = opts[:from_address]
-        @website_uri  = opts[:website_uri].gsub(/\/$/, '')
+        @website_uri  = opts[:website_uri] ? opts[:website_uri].gsub(/\/$/, '') : "http://#{`hostname`}"
         @log = opts[:logger]
         @log ||= Log4r::Logger.new("notifier")
       end

data/lib/flapjack/notifiers/xmpp/xmpp.rb

@@ -10,10 +10,16 @@ module Flapjack
     
         @jid = opts[:jid]
         @password = opts[:password]
+        @log = opts[:logger]
         unless @jid && @password 
           raise ArgumentError, "You have to provide a username and password"
         end
-        @xmpp = Jabber::Simple.new(@jid, @password)
+
+        begin 
+          @xmpp = Jabber::Simple.new(@jid, @password)
+        rescue SocketError => e
+          @log.error("XMPP: #{e.message}")
+        end
     
       end
     

data/lib/flapjack/patches.rb

@@ -15,3 +15,9 @@ module Daemons
     end
   end
 end
+
+class Log4r::Logger
+  def error(args)
+    err(args)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: auxesis-flapjack
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.4.8
 platform: ruby
 authors: 
 - Lindsay Holmwood