srvmonitor 0.0.4 → 0.0.5

data/README.markdown

@@ -41,7 +41,7 @@ SrvMonitor::Monitor.create do
     :to => 'you@gmail.com',
     :status => :down }
 
-  alert :if => :down, :attempts => 5
+  alert :if => :down, :retries => 5
   applications railswatch, loadwatch
 
   forever true

data/lib/srvmonitor/application.rb

@@ -36,7 +36,7 @@ module SrvMonitor
 
     def servers(*args)
       servers = args.find_all{ |r| r.is_a?(SrvMonitor::Server) }
-      options = args.find{ |r| r.is_a?(Hash) }
+      options = args.find{ |r| r.is_a?(Hash) } || {}
       servers.each{ |r| server(r, options) }
     end
 
@@ -49,12 +49,28 @@ module SrvMonitor
       @reports[params] = status
     end
 
-    def run
+    def run(alert)
       puts "\n### Runing #{label}"
       statuses = []
+      
+      tries = 0
+      
       @scouts.each do |scout|
+        tries += 1
+        
         scout.run(@reports)
-        statuses << scout.status
+        
+        if scout.status == alert[:if]
+          if tries <= alert[:retries]
+            redo
+          else
+            tries = 0
+            statuses << scout.status
+          end
+        else
+          statuses << scout.status
+        end
+        
       end
       @status = SrvMonitor::Report.summarize(statuses)
     end

data/lib/srvmonitor/monitor.rb

@@ -32,8 +32,7 @@ module SrvMonitor
 
     def alert(args={})
       @alert[:if] = args[:if] || :down
-      @alert[:attempts] = args[:attempts] || 1
-      @alert[:count] = 0
+      @alert[:retries] = args[:retries] || 1
     end
 
     def notifier(notifier_klass, args={})
@@ -45,21 +44,14 @@ module SrvMonitor
     end
 
     def run
-      loop do
-        @applications.each(&:run)
-
-        unless @alert.empty?
-          @alert[:count] = 0 unless status == @alert[:if]
-
-          if status == @alert[:if]
-            if @alert[:count] < @alert[:attempts]
-              @alert[:count] += 1
-              sleep @wait
-              redo
-            else
-              notify!
-              @alert[:count] = 0
-            end
+      loop do        
+        @applications.each do |app|
+          app.run(@alert)
+          
+          unless status == @alert[:if]
+            sleep @wait
+          else
+            notify!
           end
         end
 
@@ -72,7 +64,5 @@ module SrvMonitor
       return unless @notifier
       @notifier.send(self)
     end
-
   end
-end
-
+end

data/lib/srvmonitor/notifiers/mailer.rb

@@ -94,5 +94,4 @@ module SrvMonitor
       end
     end
   end
-end
-
+end

data/lib/srvmonitor/scouts/timed_http.rb

@@ -18,13 +18,18 @@ module SrvMonitor
       # @option options [String] :path The path that will be fetched from the host.
       # @option options [String] :http_class The class that will be used to fetch the page, defaults to Net::HTTP
       # @option options [Number] :timout
-      def initialize(options)
-        @port       = options[:port]       || 80
+      def initialize(options)        
         @path       = options[:path]       || '/'
         @http_class = options[:http_class] || Net::HTTP
         @timeout    = options[:timeout]    || 15
         @server     = options[:server]
         @host       = @server ? @server.host : options[:host] || '127.0.0.1'
+        
+        @port = if options[:port]
+          options[:port]
+        else
+          @server ? @server.port : 80
+        end
       end
 
       def execute

data/lib/srvmonitor/server.rb

@@ -6,7 +6,7 @@ end
 
 module SrvMonitor
   class Server
-    attr_reader :name, :description, :host, :method, :user, :password
+    attr_reader :name, :description, :host, :method, :user, :password, :port
 
     def initialize(options)
       @name = options[:name]
@@ -15,6 +15,7 @@ module SrvMonitor
       @method = options[:method] || :local
       @user = options[:user]
       @password = options[:password]
+      @port = options[:port]
     end
 
     def exec(&block)
@@ -24,7 +25,7 @@ module SrvMonitor
     end
 
     def clone(args={})
-      config = { :name => @name, :description => @description, :host => @host, :method => @method, :user => @user }
+      config = { :name => @name, :description => @description, :host => @host, :method => @method, :user => @user, :port => @port }
       Server.new config.merge(args)
     end
 

data/lib/srvmonitor/version.rb

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

metadata

@@ -1,22 +1,32 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: srvmonitor
-version: !ruby/object:Gem::Version
-  version: 0.0.4
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
-authors:
+authors: 
 - Click Jogos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-23 00:00:00.000000000Z
+
+date: 2011-11-25 00:00:00 -02:00
+default_executable: 
 dependencies: []
+
 description: Server monitor.
 email: clickjogos@clickjogos.com.br
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -40,28 +50,35 @@ files:
 - lib/srvmonitor/server.rb
 - lib/srvmonitor/version.rb
 - srvmonitor.gemspec
+has_rdoc: true
 homepage: http://www.github.com/clickjogos/srvmonitor
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: srvmonitor
-rubygems_version: 1.8.6
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Server monitor.
 test_files: []
+