qnotifier 0.6.7 → 0.6.8

data/lib/command.rb

@@ -104,7 +104,7 @@ module Qnotifier
           copy_init
           puts "Doing initial update..."
           qnotifier.run
-          puts "\nPlease start the qnotifier daemon now."
+          puts "\nPlease start the qnotifier daemon now ('sudo qnotifier start')"
         else
           puts "Exiting."
         end

data/lib/plugin.rb

@@ -16,6 +16,9 @@ module Qnotifier
     def run
       @class_name = self.class.to_s.split("::").last
       @alert_count = 0
+      @alerts = nil
+      @reports = nil
+      @stats = nil
       
       # Read the options from the global config and mix them in to the defaults for this plugin      
       if @config[@class_name]
@@ -83,6 +86,7 @@ module Qnotifier
     # Alert is no longer needed as the value has crossed back over the threshold value
     def reset_alert(name, message)
       if Qnotifier::Storage.get("AlertTime_#{@class_name}-#{name}")
+        Qnotifier.log.error "Resetting alert"
         @alerts = {@class_name => []} unless @alerts
         log.warn message
         Qnotifier::Storage.delete("AlertTime_#{@class_name}-#{name}")

data/lib/qnotifier.rb

@@ -30,9 +30,6 @@ module Qnotifier
     def initialize
       Qnotifier::Storage.restore
       
-      @alerts = {}
-      @reports = {}
-      @stats = {}
       @alert_count = 0
     end
     
@@ -48,6 +45,11 @@ module Qnotifier
     def run
       start_logging
       load_config
+      
+      @alerts = {}
+      @reports = {}
+      @stats = {}
+      @report_count = 0
             
       if Qnotifier::Storage.get("server_disabled_pings")
         Qnotifier.log.fatal "Disabled by the Qnotifer API, please re-register (qnotifier --register key) this agent to enable. Exiting."

data/lib/web_service.rb

@@ -22,9 +22,10 @@ module Qnotifier
         puts "\nAlerts:"
         pp alerts
         puts "\nNot sending alerts to server due to debug mode."
+        return
       end
       
-      Qnotifier.log.info "Sending #{alerts.count} alerts #{alerts}"
+      Qnotifier.log.info "Sending #{alerts.count} alerts #{alerts}"      
       
       # Hostname
       unless @config["hostname"]
@@ -106,8 +107,10 @@ module Qnotifier
         
         if response.code == 200
           body = JSON.parse(response.body)
-          if body[:poll_interval]
-            @@poll_interval = body[:poll_interval].to_i
+          #Qnotifier.log.info "Response #{body.inspect}"
+          if body["poll_interval"]
+            @@poll_interval = body["poll_interval"].to_i
+            #Qnotifier.log.info "Report polling interval is #{@@poll_interval}"
           end
           Qnotifier.log.debug "Server Response: HTTP #{response.code} #{body[:message]}"
         else

data/qnotifier.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qnotifier}
-  s.version = "0.6.7"
+  s.version = "0.6.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gersham Meharg"]

data.tar.gz.sig

@@ -1,2 +1,3 @@
-�zk?J���DB[�)�<��^ax|��Xl�T��xFg��D��A�V	�e�߅��Zq
-��r�У��ՋQ�N��ꣲ‚o%�����&��DH�IZww�rhu���ǃ毘
+�?��4I������$ҙa
+e6C��~b�.�:]7w8#�y�=�TB�ݷ��h�{�i�ˢj	PHMQ-o'7���&��4��T�DEikJw
+(	��Q�"/��	���B7^�G��5�ԏ��I"뙎W�Ɂ`�~R�qU'��-�]V�	ɉ��y�m*�0��d�6+t�w��6Y�8͵{����rP��â��=

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: qnotifier
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 6
-  - 7
-  version: 0.6.7
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Gersham Meharg