sidekiq-monitoring 0.4 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe841d0534ee44c3874a938fe210f0ebe2eb61ba
-  data.tar.gz: 8921f0909260f88dea2875ca2a46dd327c5c4c84
+  metadata.gz: 2962983b286d3606392025686ba29449a381d3ef
+  data.tar.gz: 8203d683a721ef29dd21c83c95c29c06a2e18488
 SHA512:
-  metadata.gz: 800b10be6050093c91a90d081e4ac1b66de180c360f5b4310088a80f0b36cd5edc9342767b073c811e88e35b2787aaff80f70cf021990fc55a2fe2ef21fb5ab0
-  data.tar.gz: 86d7c72544cc46c118db18705a02456b9954ddcb7efac08ae77727f1a30afd575299e7d11b97f13f1cca346cd4677abef80e36532e155cfce6b899d8280fdd4b
+  metadata.gz: 8362d904815946e092c1322ca75a49de970f63ee6c3e7fcc7bbd5376fc463d50dc14bbaf52d3895977ab77ff136b3709d12869a096ca080d4b62162b3a1900d7
+  data.tar.gz: de7bb1025487da6e6ae44dda4179662b8ec9318cd66580ac24dbc5ce57e80cc25484d7bab805cb2763ac955e1e60368fdaaa74baf64774df1b02e0631c715339

data/VERSION

@@ -1 +1 @@
-0.4
+0.5.1

data/lib/sidekiq-monitoring.rb

@@ -3,11 +3,16 @@ require 'multi_json'
 
 class SidekiqMonitoring < Sinatra::Base
 
-  cattr_accessor :thresholds
+  # Set yours down thresholds configuration
+  # {'default' => [ 1_000, 2_000 ], 'low' => [ 10_000, 20_000 ] }
+  def self.thresholds=(thresholds)
+    @@thresholds = thresholds
+  end
+  @@thresholds = {}
 
   get '/sidekiq_queues' do
     content_type :json
-    MultiJson.dump SidekiqMonitoring::Global.new(thresholds)
+    MultiJson.dump SidekiqMonitoring::Global.new(@@thresholds)
   end
 
   class Queue
@@ -36,7 +41,7 @@ class SidekiqMonitoring < Sinatra::Base
     def initialize(name, size, thresholds = nil)
       @name = name
       @size = size
-      @warning_threshold, @critical_threshold = (thresholds.present? ? thresholds : DEFAULT_THRESHOLD)
+      @warning_threshold, @critical_threshold = (thresholds ? thresholds : DEFAULT_THRESHOLD)
       @status = monitoring_status
     end
 
@@ -59,12 +64,12 @@ class SidekiqMonitoring < Sinatra::Base
     def as_json(options = {})
       {
         'global_status' => global_status,
-        'queues' => queues.as_json
+        'queues' => queues.map(&:as_json)
       }
     end
 
     def global_status
-      @global_status ||= queues.sort.last.try(:status) || 'UNKNOWN'
+      @global_status ||= (queues.sort.last && queues.sort.last.status) || 'UNKNOWN'
     end
 
     def initialize(thresholds = {})
@@ -78,7 +83,7 @@ class SidekiqMonitoring < Sinatra::Base
     end
 
     def thresholds_from_queue(queue_name)
-      thresholds.fetch(queue_name) { |threshold| threshold['default'] }
+      (thresholds || {}).fetch(queue_name) { |threshold| threshold['default'] }
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-monitoring
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 0.5.1
 platform: ruby
 authors:
 - Jérémy Carlier
 autorequire: 
 bindir: ''
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -38,34 +38,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -84,30 +56,30 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '3.1'
 description: Give a state of sidekiq available queues
 email: jeremy.carlier@dimelo.com
 executables: []
@@ -136,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.1
 signing_key: 
 specification_version: 4
 summary: Addons to provide a monitoring API for Sidekiq