nagios-gearman-downtime 1.0.2 → 1.0.3

data/bin/downtime_client

@@ -61,7 +61,7 @@ Usage:
 
   def set   
     duration = options[:duration].to_i * 60
-    puts "duration: #{duration}"
+    ::Nagios::Gearman::Downtime.logger.info "duration in seconds: #{duration}"
     end_time = options[:end_time] || Time.now.to_i + duration
 
     args = {

data/bin/downtime_worker

@@ -2,15 +2,14 @@
 require 'gearman'
 require 'base64'
 require 'openssl'
-require 'logger'
 require "nagios-gearman-downtime"
 
 key = `grep key /etc/mod-gearman/worker.conf`.chomp.split('=').last.strip
-::Nagios::Gearman::Downtime.log.info "key: #{key}"
+::Nagios::Gearman::Downtime.logger.info "key: #{key}"
 
 servers = []
 servers << `grep server /etc/mod-gearman/worker.conf`.chomp.split('=').last.strip
-::Nagios::Gearman::Downtime.log.info "servers: #{servers}"
+::Nagios::Gearman::Downtime.logger.info "servers: #{servers}"
 
 def aes256_decrypt(key, data)
   key = null_padding(key)
@@ -43,17 +42,17 @@ def process_external_cmd(data)
 end
 
 w = Gearman::Worker.new(['0.0.0.0:4730'])
-::Nagios::Gearman::Downtime.log.info w.status
+::Nagios::Gearman::Downtime.logger.info w.status
 
 w.add_ability('downtime') do |data,job|
-  ::Nagios::Gearman::Downtime.log.info "Data recieved:\n#{data}"
+  ::Nagios::Gearman::Downtime.logger.info "Data recieved:\n#{data}"
   decoded_data  = Base64.strict_decode64(data.gsub("\n", ''))
 
   decrypt = aes256_decrypt(key, decoded_data)
-  ::Nagios::Gearman::Downtime.log.info "decrypted data:\n#{decrypt}"
+  ::Nagios::Gearman::Downtime.logger.info "decrypted data:\n#{decrypt}"
 
   process_external_cmd(decrypt)
-  ::Nagios::Gearman::Downtime.log.info "Finished processing job"
+  ::Nagios::Gearman::Downtime.logger.info "Finished processing job"
 end
 
 loop { w.work }

data/lib/nagios-gearman-downtime.rb

@@ -1,13 +1,16 @@
+require 'logger'
+
 module Nagios
   module Gearman
     module Downtime
 
-      def self.log
+      def self.logger
         @@logger = Logger.new(STDOUT)
         @@logger.level = Logger::DEBUG
         @@logger        
       end
 
+
       def self.create_object_type(obj, obj_name)
         case obj
         when 'host' 
@@ -27,44 +30,45 @@ module Nagios
         when 'disable_servicegroup'
           object_info = "DISABLE_SERVICEGROUP_SVC_NOTIFICATIONS;#{obj_name}"
         end
-        log.info("object_info: #{object_info}")
+        logger.info "object_info: #{object_info}"
+        object_info
       end
 
 
       def self.build_payload(args)
         object_info = create_object_type(args.delete(:object_type), args.delete(:object_name))
-        
+
         if object_info.match(/enable|disable/i)
           common_args = ''
         else
-          common_args = "#{args.delete(:start_time)};#{args.delete(:end_time)};#{args.delete(:fixed)};#{args.delete(:trigger_id)};#{args.delete(:duration)};#{args.delete(:author)};#{args.delete(:comment)}"
+          common_args = ";#{args.delete(:start_time)};#{args.delete(:end_time)};#{args.delete(:fixed)};#{args.delete(:trigger_id)};#{args.delete(:duration)};#{args.delete(:author)};#{args.delete(:comment)}"
         end
         
-        payload = "[#{Time.now.to_i}] #{object_info};#{common_args}"
-        log.info("payload before encryption: #{payload}")
+        payload = "[#{Time.now.to_i}] #{object_info}#{common_args}"
+        logger.info "payload before encryption: #{payload}"
 
         if args.delete(:encryption)
           begin
             payload = aes256_encrypt(args.delete(:key), payload)
           rescue Exception => e
-            puts "unable to encrypt: #{e}"
+            logger.error "unable to encrypt payload: #{e}"
           end
         end
         payload
       end
 
       def self.send_external_cmd(options)
-        log.info "send_external_cmd options: #{options}"
+        logger.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
-          log.info "[client] Sending task: #{task.inspect}"
+          logger.info "[client] Sending task: #{task.inspect}"
           result = taskset.add_task(task)
-          log.info("result: #{resault}")
+          logger.info "result: #{result}"
         rescue Exception => e
-          log.error "Send external command failed: #{e}"
+          logger.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.2"
+      VERSION = "1.0.3"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nagios-gearman-downtime
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors: