srvmonitor 0.0.1 → 0.0.2

data/.gitignore

@@ -1 +1,3 @@
 .yardoc
+*.gem
+

data/README.markdown

@@ -1,6 +1,58 @@
 # Srvconfig
 Based on outpost (https://github.com/vinibaggio/outpost)
 
+## Example
+```ruby
+require 'srvmonitor'
+require 'srvmonitor/scouts'
+
+# define your servers
+server1 = SrvMonitor::Server.new(:name => 'first server',  :description => 'web server',  :host => '192.168.0.1', :method => :local,  :user => 'deployer')
+server2 = SrvMonitor::Server.new(:name => 'second server',  :description => 'node server',  :host => '192.168.0.2', :method => :local,  :user => 'deployer')
+
+# define your applications
+railswatch = SrvMonitor::Application.create do
+  name 'Rails Watch'
+  scout SrvMonitor::Scouts::TimedHttp, :port => 80, :path => '/', :timeout => 15
+  report :up, :response_code => 200
+
+  server server1, :port => 3000, :method => :local
+  server server2, :method => :local
+end
+
+loadwatch = SrvMonitor::Application.create do
+  name 'Load Watch'
+  scout SrvMonitor::Scouts::LoadAverage
+  report :up, :load_average => { :less_than => 50 }
+
+  servers server1, server2, :method => :remote
+end
+
+# create the monitor
+SrvMonitor::Monitor.create do
+  notifier SrvMonitor::Notifiers::Mailer, {
+    :delivery_method => 'smtp',
+    :address => 'smtp.gmail.com',
+    :port => '587',
+    :authentication => 'plain',
+    :username => 'username@gmail.com',
+    :password => 'password',
+    :enable_starttls_auto => true,
+    :to => 'you@gmail.com',
+    :status => :down }
+
+  alert :if => :down, :attempts => 5
+  applications railswatch, loadwatch
+
+  forever true
+  wait 5
+
+  run
+end
+
+```
+
+
 ## License
 
 MIT License.

data/lib/srvmonitor/expectations/load_average.rb

@@ -19,7 +19,12 @@ module SrvMonitor
       # Method that will be used as an expectation to evaluate load average
       def evaluate_load_average(scout, rules)
         rules.all? do |rule, comparison|
-          scout.load_average.send(LOAD_AVERAGE_MAPPING[rule], comparison)
+          case rule
+          when :less_than
+            scout.load_average < comparison
+          when :more_than
+            scout.load_average > comparison
+          end
         end
       end
     end

data/lib/srvmonitor/notifiers/mailer.rb

@@ -48,11 +48,9 @@ module SrvMonitor
         end
       end
 
-      # Issues a notification through email. This is a callback, called by
-      # an Outpost instance.
-      # @param [Outpost::Application, #read] outpost an instance of an outpost, containing
-      #   latest status, messages and reports that can be queried to build
-      #   a notification message.
+      # Issues a notification through email. This is a callback, called by an Outpost instance.
+      # @param [SrvMonitor::Monitor, #read] outpost an instance of an outpost, containing
+      #   latest status, messages and reports that can be queried to build a notification message.
       def send(monitor)
         smtp_connect! if @delivery_method == :smtp
 
@@ -62,8 +60,6 @@ module SrvMonitor
         mail.subject = @subject
         mail.body    = build_message(monitor)
 
-        #mail.delivery_method @delivery_method
-
         mail.deliver
       end
 

data/lib/srvmonitor/report.rb

@@ -1,5 +1,5 @@
 module SrvMonitor
-  # Contain the status report of an Outpost execution. Holds the name,
+  # Contain the status report of an SrvMonitor execution. Holds the name,
   # description and status of the reported item.
   class Report
     # Summarizes the list of statuses in a single status only.

data/lib/srvmonitor/scout.rb

@@ -37,8 +37,10 @@ module SrvMonitor
               raise NotImplementedError, "expectation '#{expectation}' wasn't implemented by #{self.class.name}"
             end
 
-            if self.class.expectations[expectation].call(self, value)
-              statuses << status
+            begin
+              statuses << status if self.class.expectations[expectation].call(self, value)
+            rescue
+              statuses << :down
             end
           end
         end

data/lib/srvmonitor/scouts/load_average.rb

@@ -6,7 +6,6 @@ module SrvMonitor
       extend SrvMonitor::Expectations::LoadAverage
 
       attr_reader :load_average
-      #report_data :load_average
 
       # Configure the scout with given options.
       # @param [Hash] Options to setup the scout
@@ -33,6 +32,8 @@ module SrvMonitor
         def local_exec
           loadavg = File.open('/proc/loadavg').read
           @load_average = loadavg.split(' ').first.to_f
+        rescue
+          @load_average = nil
         end
 
         def remote_exec
@@ -40,6 +41,8 @@ module SrvMonitor
             loadavg = ssh.exec!('cat /proc/loadavg')
             @load_average = loadavg.split(' ').first.to_f
           end
+        rescue
+          @load_average = nil
         end
 
     end

data/lib/srvmonitor/scouts/timed_http.rb

@@ -11,7 +11,6 @@ module SrvMonitor
       extend SrvMonitor::Expectations::ResponseTime
 
       attr_reader :response_code, :response_body, :response_time
-      #report_data :response_code, :response_body, :response_time
 
       # Configure the scout with given options.
       # @param [Hash] Options to setup the scout
@@ -29,17 +28,11 @@ module SrvMonitor
       end
 
       def execute
-        previous_time = Time.now
-        Timeout::timeout(@timeout) do
-          case
-          when remote? then remote_exec
-          when local?  then local_exec
-          end
+        case
+        when remote? then remote_exec
+        when local?  then local_exec
         end
-      rescue Timeout::Error
-        @response_time = (Time.now - previous_time).round
-        @response_code = @response_body = nil
-      rescue SocketError, Errno::ECONNREFUSED
+      rescue
         @response_code = @response_body = @response_time = nil
       end
 
@@ -52,20 +45,33 @@ module SrvMonitor
       private
         def local_exec
           previous_time = Time.now
-          response = @http_class.get_response(@host, @path, @port)
-          @response_time = (Time.now - previous_time) * 1000 # Miliseconds
-          @response_code = response.code.to_i
-          @response_body = response.body
+          Timeout::timeout(@timeout) do
+            response = @http_class.get_response(@host, @path, @port)
+            @response_time = (Time.now - previous_time) * 1000 # Miliseconds
+            @response_code = response.code.to_i
+            @response_body = response.body
+        rescue Timeout::Error
+          @response_time = (Time.now - previous_time).round
+          @response_code = @response_body = nil
+        rescue
+          @response_code = @response_body = @response_time = nil
         end
 
         # Runs the scout, connecting to the host and getting the response code, body and time.
         def remote_exec
+          previous_time = Time.now
+          Timeout::timeout(@timeout) do
           server.exec do |ssh|
             response = ssh.exec!("curl --write-out %{http_code}:%{time_total} --silent --output /dev/null #{ url }")
             @response_code = response.split(':').first.to_i
             @response_time = response.split(':').last.to_f * 1000
             @response_body = ssh.exec!("curl #{ url }")
           end
+        rescue Timeout::Error
+          @response_time = (Time.now - previous_time).round
+          @response_code = @response_body = nil
+        rescue
+          @response_code = @response_body = @response_time = nil
         end
 
         def url

data/lib/srvmonitor/version.rb

@@ -1,5 +1,5 @@
 module SrvMonitor
-  PATCH = 1
+  PATCH = 2
   MINOR = 0
   MAJOR = 0
   VERSION = "#{MAJOR}.#{MINOR}.#{PATCH}".freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: srvmonitor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
+date: 2011-09-21 00:00:00.000000000Z
 dependencies: []
 description: Server monitor.
 email: clickjogos@clickjogos.com.br