qnotifier 0.6.4 → 0.6.5

data/config/qnotifier_config.yml

@@ -27,7 +27,7 @@ resend_alert_time: 1 #14400 # Four hours
 # Where to look for user generated plugins
 # To add your own plugin subclass the Qnotifier::Plugin class and put this in to this directory
 # You may add configuration parameters here based on the name of your plugin class
-plugin_directory: "/var/qnotifier"
+plugin_directory: "/var/lib/qnotifier/plugins"
 
 # The System Plugin must be enabled, this gives basic stats like load average, disk use, memory, etc
 System:

data/lib/plugin.rb

@@ -83,8 +83,8 @@ module Qnotifier
     
     # Alert is no longer needed as the value has crossed back over the threshold value
     def reset_alert(name, message)
-      @alerts = {@class_name => []} unless @alerts
       if Qnotifier::Storage.get("AlertTime_#{@class_name}-#{name}")
+        @alerts = {@class_name => []} unless @alerts
         log.warn message
         Qnotifier::Storage.delete("AlertTime_#{@class_name}-#{name}")
         data = [name, message, 6] # Clear 

data/lib/qnotifier.rb

@@ -156,7 +156,10 @@ module Qnotifier
       return unless api_key
       @config["api_key"] = api_key
       begin
-        File.open(File.dirname(__FILE__) + "/../var/api_key", 'w') {|f| f.write(api_key) }
+        var_dir = "/var/lib/qnotifier"
+        FileUtils.mkdir_p var_dir unless File.exists?(var_dir)
+        File.open("/var/lib/qnotifier/api_key", 'w') {|f| f.write(api_key) }
+        File.chmod(0600, "/var/lib/qnotifier/api_key")
       rescue Exception => e
         Qnotifier.log.fatal "Can't save API Key #{e.message}"
       end
@@ -164,10 +167,6 @@ module Qnotifier
     
     def load_config
       
-      # Make the var dir if it doesn't exist
-      var_dir = File.dirname(__FILE__) + "/../var"
-      FileUtils.mkdir_p var_dir
-      
       # Load from /etc/qnotifier_config.yml if the file is there
       begin
         @config = YAML::load(File.open('/etc/qnotifier_config.yml'))
@@ -185,7 +184,11 @@ module Qnotifier
       
       unless @config["api_key"]
         begin
-          api_key_file = File.open(File.dirname(__FILE__) + "/../var/api_key")
+          # Make the var dir if it doesn't exist
+          var_dir = "/var/lib/qnotifier"
+          FileUtils.mkdir_p var_dir unless File.exists?(var_dir)
+
+          api_key_file = File.open("/var/lib/qnotifier/api_key")
           while (line = api_key_file.readline)
             @config["api_key"] = line
           end

data/lib/storage.rb

@@ -8,8 +8,10 @@ module Qnotifier
     @@restored = false
 
     def self.restore
+      saved_variables = "/var/lib/qnotifier/saved_variables.yml" 
       begin
-        saved_variables = File.dirname(__FILE__) + "/../var/saved_variables.yml" 
+        var_dir = "/var/lib/qnotifier"
+        FileUtils.mkdir_p var_dir unless File.exists?(var_dir)
         @@stored_variables = YAML::load(File.open(saved_variables))
       rescue Exception => e
         Qnotifier.log.debug "Error loading stored variables file. #{e.message}"
@@ -32,7 +34,7 @@ module Qnotifier
     end
     
     def self.wipe
-      saved_variables = File.dirname(__FILE__) + "/../var/saved_variables.yml"
+      saved_variables = "/var/lib/qnotifier/saved_variables.yml" 
       begin 
         File.delete(saved_variables)
       rescue Exception => e
@@ -46,8 +48,8 @@ module Qnotifier
     end
     
     def self.save
+      saved_variables = "/var/lib/qnotifier/saved_variables.yml" 
       begin
-        saved_variables = File.dirname(__FILE__) + "/../var/saved_variables.yml" 
         File.open(saved_variables, "w") do |f|
           f.write(YAML::dump(@@stored_variables))
         end

data/qnotifier.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{qnotifier}
-  s.version = "0.6.4"
+  s.version = "0.6.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Gersham Meharg"]
   s.date = %q{2010-05-05}
   s.default_executable = %q{qnotifier}
-  s.description = %q{The server side agent for the QNotifier monitoring system.  This software will monitor local Linux system parameters and upload them to the Qnotifier servers where users can use iPhone/iPad applications to view those stats and recevie alerts.}
+  s.description = %q{The server side agent for the QNotifier monitoring system.  This software will monitor local Linux system parameters and upload them to the QNotifier servers where users can use iPhone/iPad applications to view those stats and recieve alerts.}
   s.email = %q{gersham@qnotifier.com}
   s.executables = ["qnotifier"]
   s.extra_rdoc_files = ["bin/qnotifier", "lib/command.rb", "lib/plugin.rb", "lib/qnotifier.rb", "lib/storage.rb", "lib/web_service.rb"]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 5
+  version: 0.6.5
 platform: ruby
 authors: 
 - Gersham Meharg
@@ -122,7 +122,7 @@ dependencies:
         version: 0.1.0
   type: :development
   version_requirements: *id006
-description: The server side agent for the QNotifier monitoring system.  This software will monitor local Linux system parameters and upload them to the Qnotifier servers where users can use iPhone/iPad applications to view those stats and recevie alerts.
+description: The server side agent for the QNotifier monitoring system.  This software will monitor local Linux system parameters and upload them to the QNotifier servers where users can use iPhone/iPad applications to view those stats and recieve alerts.
 email: gersham@qnotifier.com
 executables: 
 - qnotifier