bloopletech-webstats 0.9.0 → 0.10.0

data/{README → README.textile}

@@ -1,17 +1,16 @@
-Webstats
-========
+h1. Webstats
 
 Webstats is a server and clients that monitors your servers performance (CPU usage, memory usage, disk usage, disk activity, url load time) and allows you to get notifications on your computer when the server is having problems, as well as showing (http://kimag.es/share/91090734.png) the current performance stats for the server on a web page.
 
 Webstats has 2 components: the _server_ and one or more _clients_.
 
-Server
-------
+h2. Server
+
 The server runs on the computer whose performance you want to monitor; the server application's job is to (1) monitor the computer's performance and (2) report these performance statistics through a webserver that the server application runs.
 
 See Installation below for install instructions.
 
-The server application executes in the background and starts a tiny webserver on port 9970. You can view the performance stats for your server by going to http://<server's hostname>:9970/, for example if my server was under the domain name bloople.net, I would go to http://bloople.net:9970/. The statistics on this page automatically update every 5 seconds. You may need to open port 9970 if you have a firewall on your server. Note that the various clients get their data via the webserver the server application runs, just like the built-in stats page.
+The server application executes in the background and starts a tiny webserver on port 9970. You can view the performance stats for your server by going to http://&lt;server's hostname&gt;:9970/, for example if my server was under the domain name bloople.net, I would go to http://bloople.net:9970/. The statistics on this page automatically update every 5 seconds. You may need to open port 9970 if you have a firewall on your server. Note that the various clients get their data via the webserver the server application runs, just like the built-in stats page.
 
 The statistic provided by the server application are:
 
@@ -31,48 +30,49 @@ The server application requires Linux kernel 2.6+, will not work in *BSD or OS X
 
 All the client applications depend on the server application being run to work.
 
-Clients
--------
+h2. Clients
+
 If all you want to do is be able to view the performance statistics for your server in a web browser, then you don't need to use any of these clients; going to http://<server's hostname>:9970/ will do just fine. But if you want to have Growl or email notification when something goes wrong, without having to look at a web page all the time, then you'll want one of the client applications that come with Webstats.
 
-Right now there's only one client application available, which is a Growl notifier. The Growl notifier only works on OS X, with RubyCocoa installed. This application runs in the background and monitors the server; if the server goes under high CPU load for more than a few seconds, or if the server is nearly out of memory, you'll get a Growl notification saying what the problem is. This way, you can just set and forget, knowing that Webstats will report any problems.
+There are currently two client applications available:
 
-To run the Growl notifier, first install Webstats on your local machine, using the installation instructions below (Skip the step that starts the server application). Then, if you installed webstats locally via rubygems, run:
-~$ webstats_growl_notifier
+* An email notifier; documentation is available in clients/email_notifier/README.textile
+* A Growl notifier; documentation is available in clients/growl_notifier/README.textile
 
-Otherwise, if you installed webstats manually, run:
-~$ cd webstats/clients/growl_notifier
-~/webstats/clients/growl_notifier$ ruby growl_notifier.rb
+The notifiers that ship with Webstats can be started in 2 ways; if you have installed webstats via rubygems, run:
+<pre><code>~$ webstats_<notifier_name></code></pre>
 
-The first time you run the growl notifier, it will create a configuration file at ~/.webstats_clients; you must edit this file to set the URL's for the growl notifier to monitor. The URL's should the the hostnames of the servers you want to monitor, along with the correct port number (e.g. http://bloople.net:9970/).
+For example, to run the email notifier, you can run webstats_email_notifier. If you installed webstats outside of rubygems, first change directory into the directory containing webstats, then run:
+<pre><code>~/webstats$ ruby clients/<notifier_name>/<notifier_name>.rb</code></pre>
 
-Once you've edited the configuration file to add your URL's, run the notifier again; the Growl notifier will then run in the background and notify you od any warnings or danger situations on the server.
+Many notifiers can also be run on the server, in the same ruby process as teh webstats server itself. To do this, change any settings as required by the documentation for the notifier, then add the notifier name (e.g. email_notifier) to the list of clients under webstats > clients in the ~/.webstats file
 
-Installation
-------------
+h2. Installation
 
 You can now install webstats using rubygems; this saves you a bit of hassle. To install webstats on the server via rubygems, ensure github gems are in your gems sources; then run:
-~$ sudo gem install bloopletech-webstats
+<pre><code>~$ sudo gem install bloopletech-webstats</code></pre>
 
 To run the server application, run:
-~$ webstats
+<pre><code>~$ webstats</code></pre>
 
 The server application will start in the background.
 
 If you don't want to use rubygems, then follow the below instructions:
 To install the server app, ssh into the computer you want to monitor. then run:
-~$ git clone git://github.com/bloopletech/webstats.git
+<pre><code>~$ git clone git://github.com/bloopletech/webstats.git
 ~$ cd webstats
 ~/webstats$ cd server/data_providers
 ~/webstats/server/data_providers$ ruby extconf.rb
 ~/webstats/server/data_providers$ make
+</code></pre>
 
 To run the server app, ssh into the computer you want to monitor. then run:
-~$ cd webstats
+<pre><code>~$ cd webstats
 ~/webstats$ ruby server/webstats.rb
+</pre></code>
+
+h2. Todo
 
-Todo
-----
 * Add email notifier to client applications.
 * More client applications.
 * Extend server to work on *BSD (including OS X).

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
-:minor: 9
-:patch: 0
+:minor: 10
+:patch: 1

data/clients/email_notifier/README.textile

@@ -0,0 +1,13 @@
+h1. Email notifier for Webstats
+
+The email notifier montiros one or more servers and emails you whenever the server is in danger or could be in danger soon - for example, running out of hard drive space.
+
+h2. Usage
+
+Run the notifier by running webstats_email_notifier or ruby <webstats_install_dir>/clients/email_notifier/email_notifier.rb on the terminal.
+
+It'll create a template of the settings you'll need to change in ~/.webstats_client - you'll need to set the recipient address for the emails, you may need to change the mail server settings - you can supply these settings: address, port, domain, username, password, authentication (one of :plain, :login, or :cram_md5).
+
+You'll also need to add some URL's for the email notifier to monitor - these are the URL's who statistics will be monitored. You will be notified when there is a warning or danger situation for a URL, as well as if one of the URL's can not be loaded. The URL's should the the hostnames of the servers you want to monitor, along with the correct port number (e.g. http://bloople.net:9970/).
+
+Once that's done, run the notifier again and it will begin monitoring.

data/clients/email_notifier/email_notifier.rb

@@ -1,3 +1,163 @@
+require File.dirname(__FILE__) + '/../simple_notifier'
+daemonize!
+
+class EmailNotifier < SimpleNotifier
+  def initialize(settings = {}, read_config = true)
+    @name = 'email_notifier'
+    @no_settings_message = "Please edit ~/.webstats_clients and add some URLs to monitor and an email address to notfiy on"
+    
+    super({ 'recipient' => '', 'mail_server' => { 'address' => 'localhost', 'domain' => 'localhost', 'port' => 25 } }.merge(settings), read_config)
+  end
+
+  private
+  def send_mail(subject, message)
+    sm = @settings[:mail_server]
+
+    msg = <<END_OF_MESSAGE
+From: Webstats Email Notifier <#{@settings[:recipient]}>
+To: #{@settings[:recipient]} <#{@settings[:recipient]}>
+Subject: #{subject}
+Date: #{Time.now.rfc2822}
+Message-Id: <#{Time.now.to_i}.#{rand(10000000)}@#{sm[:domain]}>
+
+#{message}
+END_OF_MESSAGE
+
+    Net::SMTP.start(sm[:address], sm[:port], sm[:domain], sm[:username], sm[:password], sm[:authentication]) { |smtp| smtp.send_message msg, @settings[:recipient], @settings[:recipient] }
+  end
+
+  def failed_url(url, password, exception)
+    send_mail("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
+
+  def notify
+    messages = []
+    has_warnings = has_dangers = false
+
+    @settings[:urls].each do |url|
+      if !url[:bad].empty? and (url[:changed] or url[:time_past])
+        has_warnings = !url[:warnings].empty?
+        has_dangers = !url[:dangers].empty?
+
+        title = []
+        title << "Danger" if has_dangers
+        title << "Warnings" if has_warnings
+        title = title.join(" & ")
+
+        warnings_text = !url[:warnings].empty? ? "Warnings for #{url[:bad].select { |(k, v)| v['status'] == 'warning' }.map { |(k, v)| url[:meta_info][k]['in_sentence'] }.join(", ")}." : nil
+        danger_text = !url[:dangers].empty? ? "Dangerous situation for #{url[:bad].select { |(k, v)| v['status'] == 'danger' }.map { |(k, v)| url[:meta_info][k]['in_sentence'] }.join(", ")}." : nil
+
+        host = URI.parse(url[:url]).host
+        messages << "#{title} for #{host}\n#{"-" * (title.length + host.length + 5)}\n\n#{[danger_text, warnings_text].compact.join("\n")}\n\nCheck statistics online at #{url[:url]}"
+      end
+    end
+
+    title = []
+    title << "Danger" if has_dangers
+    title << "Warnings" if has_warnings
+
+    send_mail("Webstats Notification - #{title.join(" & ")}", messages.join("\n\n\n")) unless messages.empty?
+  end
+end
+
+s = EmailNotifier.new()
+s.start
+
+=begin
+
+
+
+
+
+
+require File.dirname(__FILE__) + '/../common'
+prepare_client
+
+load_settings('email_notifier', { 'email_addresses' => ['example@example.com'] }] }, "Please edit ~/.webstats_clients and add some email addresss to send to")
+
+urls = $settings[:urls]
+emails = $settings[:emails]
+
+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], 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], 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'] != '' }
+
+    has_warnings = bad.detect { |(k, v)| v['status'] == 'warning' }
+    has_dangers = bad.detect { |(k, v)| v['status'] == 'danger' }
+  
+    title = []
+    title << "Danger" if has_dangers
+    title << "Warnings" if has_warnings
+    title = title.join(" & ") + " for host #{URI.parse(url[:url]).host}"
+  
+    warnings_text = has_warnings ? "Warnings for #{bad.select { |(k, v)| v['status'] == 'warning' }.map { |(k, v)| url[:meta_info][k]['in_sentence'] }.join(", ")}." : nil
+    danger_text = has_dangers ? "Dangerous situation for #{bad.select { |(k, v)| v['status'] == 'danger' }.map { |(k, v)| url[:meta_info][k]['in_sentence'] }.join(", ")}." : nil
+
+    if url[:last_warnings_text] != warnings_text or url[:last_danger_text] != danger_text or (url[:last_time] != 0 and (Time.now - url[:last_time]) > 60)
+      url[:last_warnings_text] = warnings_text
+      url[:last_danger_text] = danger_text
+      url[:last_time] = Time.now
+
+      unless bad.empty?
+        g.notify "Webstats Notification", title, [danger_text, warnings_text].compact.join(" "), nil, nil, true, (has_dangers ? 2 : 1)
+      end
+    end
+  end
+
+  sleep(10)
+end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 require 'rubygems'
 require 'net/smtp'
 require 'net/dns/resolver'
@@ -26,4 +186,5 @@ END_OF_MESSAGE
   Net::SMTP.start(mxrs.first.exchange, 25, domain) { |smtp| smtp.send_message msg, recipient, recipient }
 end
 
-send_mail_hardcore(*ARGV)
+send_mail_hardcore(*ARGV)
+=end

data/clients/growl_notifier/README.textile

@@ -0,0 +1,13 @@
+h1. Growl notifer for Webstats
+
+The Growl notifier runs in the background and monitors the server; if the server goes under high CPU load for more than a few seconds, or if the server is nearly out of memory, you'll get a Growl notification saying what the problem is. This way, you can just set and forget, knowing that Webstats will report any problems.
+
+Thy works on OS X only, with RubyCocoa installed. 
+
+.h2 Usage
+
+Run the notifier by running webstats_growl_notifier or ruby <webstats_install_dir>/clients/growl_notifier/growl_notifier.rb on the terminal.
+
+The first time you run the growl notifier, it will create a template of the settings you need to edit at ~/.webstats_clients; you must edit this file to set the URL's for the growl notifier to monitor. The URL's should the the hostnames of the servers you want to monitor, along with the correct port number (e.g. http://bloople.net:9970/).
+
+Once you've edited the configuration file to add your URL's, run the notifier again; the Growl notifier will then run in the background and notify you od any warnings or danger situations on the server.

data/clients/growl_notifier/growl_notifier.rb

@@ -1,62 +1,41 @@
-if true or $DEBUG
-  Thread.abort_on_exception
-else
-  exit if fork
-  $stdout = File.new('/dev/null', 'w')
-  $stderr = File.new('/dev/null', 'w')
-end
-
-require 'rubygems'
-require 'json'
-require 'net/http'
-require 'uri'
+require File.dirname(__FILE__) + '/../simple_notifier'
+daemonize!
 require File.dirname(__FILE__) + '/Growl.rb'
 
-require File.dirname(__FILE__) + '/../common'
-load_settings('growl_notifier', { 'urls' => [{ 'url' => '', 'password' => nil }] }, "Please edit ~/.webstats_clients and add some URLs to monitor")
-
-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], failed_url), :last_warnings_text => nil, :last_danger_text => nil, :last_time => 0 })
-end
+class WGrowlNotifier < SimpleNotifier
+  def initialize(settings = {}, read_config = true)
+    @name = "growl_notifier"
+    @no_settings_message = "Please edit ~/.webstats_clients and add some URLs to monitor"
 
-while(true)
-  urls.each do |url|
-    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'] != '' }
-
-    has_warnings = bad.detect { |(k, v)| v['status'] == 'warning' }
-    has_dangers = bad.detect { |(k, v)| v['status'] == 'danger' }
-  
-    title = []
-    title << "Danger" if has_dangers
-    title << "Warnings" if has_warnings
-    title = title.join(" & ") + " for host #{URI.parse(url[:url]).host}"
+    @g = GrowlNotifier.new("Webstats", ['Webstats Notification'], nil, OSX::NSWorkspace.sharedWorkspace().iconForFileType_('unknown'))
+    @g.register
+    
+    super(settings, read_config)
+  end
   
-    warnings_text = has_warnings ? "Warnings for #{bad.select { |(k, v)| v['status'] == 'warning' }.map { |(k, v)| url[:meta_info][k]['in_sentence'] }.join(", ")}." : nil
-    danger_text = has_dangers ? "Dangerous situation for #{bad.select { |(k, v)| v['status'] == 'danger' }.map { |(k, v)| url[:meta_info][k]['in_sentence'] }.join(", ")}." : nil
+  private
+  def failed_url(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
+
+  def notify
+    @settings[:urls].each do |url|
+     if !url[:bad].empty? and (url[:changed] or url[:time_past])
+       title = []
+       title << "Danger" unless url[:dangers].empty?
+       title << "Warnings" unless url[:warnings].empty?
+       title = title.join(" & ") + " for host #{URI.parse(url[:url]).host}"
 
-    if url[:last_warnings_text] != warnings_text or url[:last_danger_text] != danger_text or (url[:last_time] != 0 and (Time.now - url[:last_time]) > 60)
-      url[:last_warnings_text] = warnings_text
-      url[:last_danger_text] = danger_text
-      url[:last_time] = Time.now
+       warnings_text = !url[:warnings].empty? ? "Warnings for #{url[:bad].select { |(k, v)| v['status'] == 'warning' }.map { |(k, v)| url[:meta_info][k]['in_sentence'] }.join(", ")}." : nil
+       danger_text = !url[:dangers].empty? ? "Dangerous situation for #{url[:bad].select { |(k, v)| v['status'] == 'danger' }.map { |(k, v)| url[:meta_info][k]['in_sentence'] }.join(", ")}." : nil
 
-      unless bad.empty?
-        g.notify "Webstats Notification", title, [danger_text, warnings_text].compact.join(" "), nil, nil, true, (has_dangers ? 2 : 1)
-      end
-    end
+       @g.notify "Webstats Notification", title, [danger_text, warnings_text].compact.join(" "), nil, nil, true, (!url[:dangers].empty? ? 2 : 1)
+     end
+   end
   end
+end
 
-  sleep(10)
-end
+s = WGrowlNotifier.new()
+s.start

data/clients/simple_notifier.rb

@@ -0,0 +1,106 @@
+require 'yaml'
+require 'net/http'
+require 'uri'
+require 'thread'
+require 'time'
+require 'net/smtp'
+
+def daemonize!
+  return if $DAEMONIZE == false
+  if $DEBUG
+    Thread.abort_on_exception
+  else
+    if (pid = fork)
+      Signal.trap('HUP', 'IGNORE')
+      Process.detach(pid)
+      exit
+    end
+  end
+end
+
+class Hash
+  alias_method :undecorated_get, :[] unless method_defined?(:undecorated_get)
+  def [](key)
+    undecorated_get(key) or undecorated_get(key.is_a?(String) ? key.to_sym : key.to_s)
+  end
+end
+
+class SimpleNotifier
+  def initialize(settings = {}, read_config = true)
+    @name ||= "notifier"
+    @default_settings ||= {}
+    
+    if read_config
+      config_file_path = File.expand_path("~/.webstats_clients")
+
+      @settings = {}
+
+      if File.exists?(config_file_path)
+        @settings = YAML.load(IO.read(config_file_path))
+        @settings ||= {}
+      end
+    
+      unless @settings.key?(@name)
+        @settings[@name] = { 'urls' => [{ 'url' => 'http://localhost:9970/', 'password' => nil }] }.merge(@default_settings).merge(settings)
+        File.open(config_file_path, "w") { |f| YAML.dump(@settings, f) }
+
+        puts @no_settings_message
+        exit
+      end
+    
+      @settings = @settings[@name]
+    else
+      @settings = settings
+    end
+  end
+
+  def start
+    @settings[:urls].each do |url|
+      url[:mutex] = Mutex.new
+      Thread.new do
+        url[:mutex].synchronize { url.merge!({ :meta_info => make_request(URI.join(url[:url], "information"), url[:password]), :last_time => 0 }) }
+      end
+    end
+
+    while(true)
+      threads = []
+      @settings[:urls].each do |url|
+        threads << Thread.new do
+          url[:mutex].synchronize do
+            url[:data] = make_request(URI.join(url[:url], "update"), url[:password])
+            url[:bad] = url[:data].sort { |a, b| b[1]['importance'].to_f <=> a[1]['importance'].to_f }.select { |(k, v)| !v['status'].nil? && v['status'] != '' }
+            url[:last_warnings] = url[:warnings] || []
+            url[:warnings] = url[:bad].select { |(k, v)| v['status'] == 'warning' }
+            url[:has_warnings]= !url[:warnings].empty?
+            url[:last_dangers] = url[:dangers] || []
+            url[:dangers] = url[:bad].select { |(k, v)| v['status'] == 'danger' }
+            url[:has_dangers] = !url[:dangers].empty?
+            url[:changed] = (!url[:warnings].empty? || !url[:dangers].empty?) && (!url.key?(:changed) or (url[:warnings].length > url[:last_warnings].length) or (url[:dangers].length > url[:last_dangers].length))
+            url[:time_past] = url[:last_time] != 0 && (Time.now - url[:last_time]) > 60
+            url[:last_time] = Time.now if url[:changed] || url[:last_time].nil? || url[:time_past]
+          end
+        end
+      end
+      threads.each { |t| t.join }
+      notify
+      sleep(10)
+    end
+  end
+
+  private
+  def make_request(url, password)
+    while(true)
+      begin
+        Net::HTTP.start(url.host, url.port) { |http|
+          http.read_timeout = http.open_timeout = 15
+          req = Net::HTTP::Get.new(url.request_uri)
+          req.basic_auth 'webstats', password unless password.nil?
+          return YAML.load(http.request(req).body)
+        }
+      rescue Exception => e
+        return nil unless failed_url(url, password, e)
+      end
+    end
+  end
+end
+

data/server/webstats.rb

@@ -1,3 +1,4 @@
+#NO GEM DEPENDENCIES FTW
 require 'webrick'
 require 'yaml'
 
@@ -9,8 +10,6 @@ else
     Process.detach(pid)
     exit
   end
-  $stdout = File.new('/dev/null', 'w')
-  $stderr = File.new('/dev/null', 'w')
 end
 
 Thread.new do
@@ -73,7 +72,7 @@ class Array
   end
 
   def to_json
-    "[#{map { |e| e.to_json }.join(',')}]"
+    "[#{map { |e| e.to_json }.join(', ')}]"
   end
 end
 
@@ -98,15 +97,15 @@ class Hash
     each_pair { |k, v| self[k] = self[k].dup.stringify_keys! if v.is_a? Hash }
   end
 
-  alias_method :undecorated_get, :[]
+  alias_method :undecorated_get, :[] unless method_defined?(:undecorated_get)
   def [](key)
     undecorated_get(key) or undecorated_get(key.is_a?(String) ? key.to_sym : key.to_s)
   end
 
   def to_json
     arr = []
-    each_pair { |k, v| arr << "#{k.to_json}:#{v.to_json}" }
-    "{#{arr.join(',')}}"
+    each_pair { |k, v| arr << "#{k.to_json}: #{v.to_json}" }
+    "{#{arr.join(', ')}}"
   end
 end
 
@@ -140,7 +139,7 @@ $settings = {}
 if File.exists?(WEBSTATS_PATH)
   $settings = YAML.load(IO.read(WEBSTATS_PATH)).symbolize_keys!
 else
-  $settings['webstats'] = { 'password' => nil }
+  $settings['webstats'] = { 'password' => nil, 'clients' => [] }
   DataProviders::DATA_SOURCES_CLASSES.each_pair { |k, v| $settings[k.to_s] = v.default_settings.stringify_keys! }
   File.open(WEBSTATS_PATH, "w") { |f| YAML.dump($settings, f) }
 end
@@ -198,7 +197,6 @@ class Webstats < WEBrick::HTTPServlet::AbstractServlet
             {
                var results = eval("(" + http.responseText + ")");
                if(!results) return;
-                 console.log('procing');
 EOF
 
       DataProviders::DATA_SOURCES.each_pair do |k, v|
@@ -248,14 +246,24 @@ EOF
   end
 end
 
-s = WEBrick::HTTPServer.new(:Port => 9970)
+threads = []
+
+s = WEBrick::HTTPServer.new(:Port => 9970, :Logger => WEBrick::Log.new(nil, 0), :AccessLog => WEBrick::Log.new(nil, 0))
 
 death = proc do
   s.shutdown
   DataProviders::DATA_SOURCES.each_pair { |k, v| v.kill }
+  threads.each { |t| t.kill }
 end
 trap("INT", death)
 trap("TERM", death)
 
 s.mount("/", Webstats)
-s.start
+threads << Thread.new { s.start }
+
+if $settings['webstats'].key?(:clients) and !$settings['webstats'][:clients].nil?
+  $DAEMONIZE = false
+  $settings['webstats'][:clients].each { |name| threads << Thread.new { require "#{File.dirname(__FILE__)}/../clients/#{name}/#{name}.rb" } }
+end
+
+threads.first.join

data/webstats.gemspec

@@ -2,30 +2,32 @@
 
 Gem::Specification.new do |s|
   s.name = %q{webstats}
-  s.version = "0.9.0"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brenton Fletcher"]
-  s.date = %q{2009-05-06}
+  s.date = %q{2009-05-14}
   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"]
   s.extensions = ["server/data_providers/extconf.rb"]
   s.extra_rdoc_files = [
     "LICENSE",
-    "README"
+    "README.textile"
   ]
   s.files = [
     "LICENSE",
-    "README",
+    "README.textile",
     "Rakefile",
     "VERSION.yml",
     "bin/webstats",
     "bin/webstats_growl_notifier",
-    "clients/common.rb",
+    "clients/email_notifier/README.textile",
     "clients/email_notifier/email_notifier.rb",
     "clients/growl_notifier/Growl.rb",
+    "clients/growl_notifier/README.textile",
     "clients/growl_notifier/growl_notifier.rb",
+    "clients/simple_notifier.rb",
     "server/data_providers/cpu_info.rb",
     "server/data_providers/disk_activity.rb",
     "server/data_providers/disk_usage.c",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bloopletech-webstats
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Brenton Fletcher
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-06 00:00:00 -07:00
+date: 2009-05-14 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -22,18 +22,20 @@ extensions:
 - server/data_providers/extconf.rb
 extra_rdoc_files: 
 - LICENSE
-- README
+- README.textile
 files: 
 - LICENSE
-- README
+- README.textile
 - Rakefile
 - VERSION.yml
 - bin/webstats
 - bin/webstats_growl_notifier
-- clients/common.rb
+- clients/email_notifier/README.textile
 - clients/email_notifier/email_notifier.rb
 - clients/growl_notifier/Growl.rb
+- clients/growl_notifier/README.textile
 - clients/growl_notifier/growl_notifier.rb
+- clients/simple_notifier.rb
 - server/data_providers/cpu_info.rb
 - server/data_providers/disk_activity.rb
 - server/data_providers/disk_usage.c

data/clients/common.rb

@@ -1,42 +0,0 @@
-class Hash
-  alias_method :undecorated_get, :[]
-  def [](key)
-    undecorated_get(key) or undecorated_get(key.is_a?(String) ? key.to_sym : key.to_s)
-  end
-end
-
-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))[client_key]
-  else
-    $settings[client_key] = defaults
-
-    File.open(config_file_path, "w") do |f|
-      YAML.dump($settings, f)
-    end
-
-    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
-