bloopletech-webstats 0.6.0 → 0.7.0

data/VERSION.yml

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

data/clients/common.rb

@@ -5,22 +5,38 @@ class Hash
   end
 end
 
-def load_settings(defaults_key, defaults)
+def load_settings(client_key, defaults, message)
   config_file_path = File.expand_path("~/.webstats_clients")
 
   $settings = {}
 
   if File.exists?(config_file_path)
-    $settings = YAML.load(IO.read(config_file_path))
+    $settings = YAML.load(IO.read(config_file_path))[client_key]
   else
-    $settings[defaults_key] = defaults
+    $settings[client_key] = defaults
 
     File.open(config_file_path, "w") do |f|
       YAML.dump($settings, f)
     end
 
-    puts "Please edit ~/.webstats_clients and add some URLs to monitor"
+    puts message
     exit
   end
 end
+
+def make_request(url, password, failed_proc)
+  while(true)
+    begin
+      Net::HTTP.start(url.host, url.port) { |http|
+        http.read_timeout = http.open_timeout = 15
+        puts url.request_uri
+        req = Net::HTTP::Get.new(url.request_uri)
+        req.basic_auth 'webstats', password unless password.nil?
+        return JSON.parse(http.request(req).body)
+      }
+    rescue Exception => e
+      return nil unless failed_proc.call(url, password, e)
+    end
+  end
+end
   

data/clients/growl_notifier/growl_notifier.rb

@@ -1,4 +1,4 @@
-if $DEBUG
+if true or $DEBUG
   Thread.abort_on_exception
 else
   exit if fork
@@ -13,26 +13,26 @@ require 'uri'
 require File.dirname(__FILE__) + '/Growl.rb'
 
 require File.dirname(__FILE__) + '/../common'
-load_settings('growl_notifier', { 'urls' => [{ 'url' => '', 'password' => nil }] })
+load_settings('growl_notifier', { 'urls' => [{ 'url' => '', 'password' => nil }] }, "Please edit ~/.webstats_clients and add some URLs to monitor")
 
-def make_request(url, password)
-  req = Net::HTTP::Get.new(url.request_uri)
-  req.basic_auth 'webstats', password unless password.nil?
-  JSON.parse(Net::HTTP.new(url.host, url.port).start { |http| http.request(req).body })
-end
-
-urls = $settings[:growl_notifier][:urls]
+urls = $settings[:urls]
 
 g = GrowlNotifier.new("Webstats", ['Webstats Notification'], nil, OSX::NSWorkspace.sharedWorkspace().iconForFileType_('unknown'))
 g.register
 
+failed_url = lambda do |url, password, exception|
+  g.notify "Webstats Notification", "Cannot load Webstats data", "Could not load #{url}#{!password.nil? ? " with password #{password}" : ""}, error was #{exception.message}. Will try again in 60 seconds."
+  sleep(60)
+  true
+end
+
 urls.each do |url|
-  url.merge!({ :meta_info => make_request(URI.join(url[:url], "information"), url[:password]), :last_warnings_text => nil, :last_danger_text => nil, :last_time => 0 })
+  url.merge!({ :meta_info => make_request(URI.join(url[:url], "information"), url[:password], failed_url), :last_warnings_text => nil, :last_danger_text => nil, :last_time => 0 })
 end
 
 while(true)
   urls.each do |url|
-    data = make_request(URI.join(url[:url], "update"), url[:password])
+    data = make_request(URI.join(url[:url], "update"), url[:password], failed_url)
 
     bad = data.sort { |a, b| b[1]['importance'].to_f <=> a[1]['importance'].to_f }.select { |(k, v)| !v['status'].nil? && v['status'] != '' }
 

data/server/data_providers/url_monitor.rb

@@ -11,13 +11,19 @@ class DataProviders::UrlMonitor
     @thread = Thread.new do
       while(true)
         @settings[:urls].sort.each do |url|
+          @mutex.synchronize { @readings[url] = { :response_time => -1, :works => (@readings.key?(url) && @readings[url][:works] == :failed ? :failed : :waiting) } }
           duration = -1
-          works = false
+          works = :failed
           begin
+            uri = URI.parse(url)
             start = Time.now
-            result = Net::HTTP.get(URI.parse(url))
+            Net::HTTP.start(uri.host) { |http|
+              http.read_timeout = http.open_timeout = @settings[:danger_response_time_threshold] * 1000
+              raise Exception unless http.get(uri.path).code.include?(200, 201, 202, 203, 204, 205, 206, 301, 302, 304)
+            }
+
             duration = Time.now - start
-            works = true
+            works = :works
           rescue Exception => e
           end
           @mutex.synchronize { @readings[url] = { :response_time => duration * 1000, :works => works } }
@@ -32,8 +38,8 @@ class DataProviders::UrlMonitor
     out = {}
     @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]
+      out[:status] = 'warning' if (info[:works] == :failed) or info[:response_time] > @settings[:warning_response_time_threshold] and !out[:status] == 'danger'
+      out[:status] = 'danger' if (info[:works] == :failed) or info[:response_time] > @settings[:danger_response_time_threshold]
     end
     out
   end
@@ -45,7 +51,7 @@ for(var i = 0; i < data_source['urls'].length; i++)
 {
    var ud = data_source['urls'][i][1];
    temp += "<div class='major_figure'><span class='title'>" + data_source['urls'][i][0] + "</span><span class='figure'>" +
-    (!ud['works'] ? 'Failed</span>' : ud['response_time'] + "</span><span class='unit'>ms</span>") + "</div>";
+    (ud['works'] == 'failed' ? 'Failed</span>' : (ud['works'] == 'waiting' ? 'Waiting</span>' : ud['response_time'] + "</span><span class='unit'>ms</span>")) + "</div>";
 }
 
 sc.innerHTML = temp;

data/webstats.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webstats}
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brenton Fletcher"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bloopletech-webstats
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Brenton Fletcher