resque-monitoring 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d4474513df0631b5b929ef66d105ea6953971f9
-  data.tar.gz: c44bb8f0dd6b5f28e42be21e3c43d17e99085bae
+  metadata.gz: 4b20ecf9be0c45f0abf6fe82f48f69ae0441a07c
+  data.tar.gz: 673a2ffbb4a24f744a83c77b06391a5f7ca69cbb
 SHA512:
-  metadata.gz: 7623cddc69d3172611e91bd74259a88e39931218e0880d4c7a0c4ade3d12e454d740711476945502d6f3bdaa1f36f9e2169c5cd6927f26a3fece1b43ee1b3f1f
-  data.tar.gz: b79aa822cd86aa94b8a77a56207117cd1f9c4367328c4ea58434b904001d4c70867bd2d1aeec950ad80e1d3950874d1f5b8e273002b4e6b51d48df7e074fbd24
+  metadata.gz: d96a0ec708bac72f629d83017dc621c6f5d95c7f0c6986ee685c2d02c5b1d875868b4db9df369cc3cde25685346ad749ac25429910e297bb1062f4f2d4ceaaff
+  data.tar.gz: 51c4fa58a8bc6f90d9067260b1f4cd8a94087948b8f75c99f14b816cd936d08362a2d853084713644ef1a64e02158a3264fd9688acb48bd8a7a507ab1e95081d

data/lib/resque/monitoring.rb

@@ -3,6 +3,7 @@ require "resque/monitoring/version"
 module Resque
   module Monitoring
     require 'active_support/core_ext'
+    require 'resque/monitoring/status'
     require 'resque/monitoring/scheduler'
   end
 end

data/lib/resque/monitoring/scheduler.rb

@@ -15,20 +15,34 @@ module Resque
       end
 
       def status
-        return :ok if assert.call(last_execution.date)
-        :error
+        last_execution_date = last_execution.date
+        return not_executed_yet unless last_execution_date.present?
+        return Status.ok if assert.call(last_execution_date)
+        executed_long_time_ago(last_execution_date)
       end
 
       private
+      def not_executed_yet
+        Status.error('not executed yet')
+      end
+
+      def executed_long_time_ago(last_execution_date)
+        Status.error("executed a long time ago, last execution: #{last_execution_date}")
+      end
+
       def assert
-        @assert ||= Proc.new do |last_execution|
-                               last_execution >= DateTime.now - 15.minutes
-                             end
+        @assert ||= default_assert
       end
 
       def last_execution
         @last_execution ||= LastExecution.by(name)
       end
+
+      def default_assert
+        Proc.new do |last_execution|
+          last_execution >= DateTime.now - 15.minutes
+        end
+      end
     end
   end
 end

data/lib/resque/monitoring/scheduler/last_execution.rb

@@ -17,8 +17,7 @@ module Resque
 
         def date
           value = Resque.redis.get(key)
-          return DateTime.iso8601(value) if value
-          DateTime.now - 30.years
+          DateTime.iso8601(value) if value
         end
 
         private

data/lib/resque/monitoring/status.rb

@@ -0,0 +1,31 @@
+# encoding: utf-8
+
+class Status
+  attr_reader :name, :message
+  @status = {}
+
+  def self.ok
+    fetch(:ok, 'status.alive') { |callback| }
+  end
+
+  def self.error(message)
+    fetch(:error, message) do |callback|
+      callback.call(message)
+    end
+  end
+
+  def when_error(&callback)
+    @status_callback.call(callback)
+  end
+
+  private
+  def initialize(name, message, &status_callback)
+    @name = name
+    @message = message
+    @status_callback = status_callback
+  end
+
+  def self.fetch(status, message, &callback)
+    @status["#{status}#{message}"] ||= new(status, message, &callback)
+  end
+end

data/lib/resque/monitoring/version.rb

@@ -1,5 +1,5 @@
 module Resque
   module Monitoring
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-monitoring
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Narciso Benigno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-15 00:00:00.000000000 Z
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,6 +89,7 @@ extra_rdoc_files: []
 files:
 - lib/resque/monitoring/scheduler/last_execution.rb
 - lib/resque/monitoring/scheduler.rb
+- lib/resque/monitoring/status.rb
 - lib/resque/monitoring/version.rb
 - lib/resque/monitoring.rb
 homepage: ''