bloopletech-webstats 0.5.0 → 0.6.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 5
-:patch: 1
+:minor: 6
+:patch: 0

data/server/data_providers/url_monitor.rb

@@ -4,14 +4,12 @@ class DataProviders::UrlMonitor
   def initialize(settings)
     @settings = self.class.default_settings.merge(settings)
 
-    @readings = []
+    @readings = {}
 
     @mutex = Mutex.new
 
     @thread = Thread.new do
       while(true)
-        @mutex.synchronize { @readings = [] }
-
         @settings[:urls].sort.each do |url|
           duration = -1
           works = false
@@ -22,7 +20,7 @@ class DataProviders::UrlMonitor
             works = true
           rescue Exception => e
           end
-          @mutex.synchronize { @readings << [url, { :response_time => duration * 1000, :works => works }] }
+          @mutex.synchronize { @readings[url] = { :response_time => duration * 1000, :works => works } }
         end
         sleep(@settings[:update_rate])
       end
@@ -32,7 +30,7 @@ class DataProviders::UrlMonitor
 
   def get
     out = {}
-    @mutex.synchronize { out[:urls] = @readings }
+    @mutex.synchronize { out[:urls] = @readings.to_a.sort_by { |e| e[0] } }
     out[:urls].each do |(url, info)|
       out[:status] = 'warning' if !info[:works] or info[:response_time] > @settings[:warning_response_time_threshold] and !out[:status] == 'danger'
       out[:status] = 'danger' if !info[:works] or info[:response_time] > @settings[:danger_response_time_threshold]
@@ -55,7 +53,7 @@ sc.innerHTML = temp;
   end
 
   def self.default_settings
-    { :update_rate => 30, :warning_response_time_threshold => 5000, :danger_response_time_threshold => 30000, :urls => ['http://localhost/'] }
+    { :update_rate => 30, :warning_response_time_threshold => 5000, :danger_response_time_threshold => 15000, :urls => ['http://localhost/'] }
   end
 
   def information

data/server/webstats.rb

@@ -60,6 +60,10 @@ class Array
     end
   end
 
+  def symbolize_keys!
+    each_with_index { |v, i| self[i] = self[i].dup.symbolize_keys! if v.is_a? Hash }
+  end
+
   def stringify_keys!
     each_with_index { |v, i| self[i] = self[i].dup.stringify_keys! if v.is_a? Hash }
   end
@@ -80,6 +84,11 @@ class Hash
     end
   end
   
+  def symbolize_keys!
+    keys.each { |key| self[key.to_sym] = delete(key) }
+    each_pair { |k, v| self[k] = self[k].dup.symbolize_keys! if v.is_a? Hash }
+  end
+
   def stringify_keys!
     keys.each { |key| self[key.to_s] = delete(key) }
     each_pair { |k, v| self[k] = self[k].dup.stringify_keys! if v.is_a? Hash }
@@ -125,7 +134,7 @@ WEBSTATS_PATH = File.expand_path("~/.webstats")
 $settings = {}
 
 if File.exists?(WEBSTATS_PATH)
-  $settings = YAML.load(IO.read(WEBSTATS_PATH))
+  $settings = YAML.load(IO.read(WEBSTATS_PATH)).symbolize_keys!
 else
   $settings['webstats'] = { 'password' => nil }
   DataProviders::DATA_SOURCES_CLASSES.each_pair { |k, v| $settings[k.to_s] = v.default_settings.stringify_keys! }

data/webstats.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webstats}
-  s.version = "0.5.0"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brenton Fletcher"]
-  s.date = %q{2009-04-27}
+  s.date = %q{2009-04-28}
   s.description = %q{Monitor server CPU/Memory/Disk Usage/URL Loading, so that you can view those statistics on a web page, as well as providing an interface to client prorams to read those statistics.}
   s.email = %q{i@bloople.net}
   s.executables = ["webstats", "webstats_growl_notifier"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bloopletech-webstats
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Brenton Fletcher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 -07:00
+date: 2009-04-28 00:00:00 -07:00
 default_executable: 
 dependencies: []