nagios-gearman-downtime 1.0.1 → 1.0.2

data/bin/downtime_worker

@@ -3,15 +3,14 @@ require 'gearman'
 require 'base64'
 require 'openssl'
 require 'logger'
-
-logger = Logger.new(STDOUT)
+require "nagios-gearman-downtime"
 
 key = `grep key /etc/mod-gearman/worker.conf`.chomp.split('=').last.strip
-logger.info "key: #{key}"
+::Nagios::Gearman::Downtime.log.info "key: #{key}"
 
 servers = []
 servers << `grep server /etc/mod-gearman/worker.conf`.chomp.split('=').last.strip
-logger.info "servers: #{servers}"
+::Nagios::Gearman::Downtime.log.info "servers: #{servers}"
 
 def aes256_decrypt(key, data)
   key = null_padding(key)
@@ -28,8 +27,14 @@ end
 
 
 def process_external_cmd(data)
-  path = '/var/lib/icinga/rw/icinga.cmd'
+  if File.exist?('/usr/local/nagios/var/rw/nagios.cmd')
+    path = '/usr/local/nagios/var/rw/nagios.cmd'
+  end
 
+  if File.exist?('/var/lib/icinga/rw/icinga.cmd')
+    path = '/var/lib/icinga/rw/icinga.cmd'
+  end
+ 
   File.open(path, 'a') do |pipe|
     puts "Sending downtime: #{data}"
     pipe.puts data
@@ -38,17 +43,17 @@ def process_external_cmd(data)
 end
 
 w = Gearman::Worker.new(['0.0.0.0:4730'])
-logger.info w.status
+::Nagios::Gearman::Downtime.log.info w.status
 
 w.add_ability('downtime') do |data,job|
-  logger.info "Data recieved:\n#{data}"
+  ::Nagios::Gearman::Downtime.log.info "Data recieved:\n#{data}"
   decoded_data  = Base64.strict_decode64(data.gsub("\n", ''))
 
   decrypt = aes256_decrypt(key, decoded_data)
-  logger.info "decrypted data:\n#{decrypt}"
+  ::Nagios::Gearman::Downtime.log.info "decrypted data:\n#{decrypt}"
 
   process_external_cmd(decrypt)
-  logger.info "Finished processing job"
+  ::Nagios::Gearman::Downtime.log.info "Finished processing job"
 end
 
 loop { w.work }

data/lib/nagios-gearman-downtime.rb

@@ -2,6 +2,12 @@ module Nagios
   module Gearman
     module Downtime
 
+      def self.log
+        @@logger = Logger.new(STDOUT)
+        @@logger.level = Logger::DEBUG
+        @@logger        
+      end
+
       def self.create_object_type(obj, obj_name)
         case obj
         when 'host' 
@@ -21,6 +27,7 @@ module Nagios
         when 'disable_servicegroup'
           object_info = "DISABLE_SERVICEGROUP_SVC_NOTIFICATIONS;#{obj_name}"
         end
+        log.info("object_info: #{object_info}")
       end
 
 
@@ -34,6 +41,7 @@ module Nagios
         end
         
         payload = "[#{Time.now.to_i}] #{object_info};#{common_args}"
+        log.info("payload before encryption: #{payload}")
 
         if args.delete(:encryption)
           begin
@@ -46,16 +54,17 @@ module Nagios
       end
 
       def self.send_external_cmd(options)
-        puts "send_external_cmd options: #{options}"
+        log.info "send_external_cmd options: #{options}"
         client  = ::Gearman::Client.new(options[:gearman_job_server])
         taskset = ::Gearman::TaskSet.new(client)
         encoded_job = Base64.encode64(options[:job])
         task = ::Gearman::Task.new(options[:queue], encoded_job) 
         begin
-          puts "[client] Sending task: #{task.inspect}"
+          log.info "[client] Sending task: #{task.inspect}"
           result = taskset.add_task(task)
+          log.info("result: #{resault}")
         rescue Exception => e
-          "Send external command failed: #{e}"
+          log.error "Send external command failed: #{e}"
         end
       end
 

data/lib/nagios-gearman-downtime/version.rb

@@ -1,7 +1,7 @@
 module Nagios
   module Gearman
     module Downtime
-      VERSION = "1.0.1"
+      VERSION = "1.0.2"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagios-gearman-downtime
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gearman-ruby