sidekiq_metered_exceptions 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a51b45cb8ba0baa5bd485f34f0daf94583f87e6
-  data.tar.gz: 3eca51f15da353bb318e43f8ec911891d206e37d
+  metadata.gz: 79b03042f7659b991d71c1fb5a5d5fe2f200fbd7
+  data.tar.gz: 0b71c4a04f953025c6bd7f271dd4d7e683323d21
 SHA512:
-  metadata.gz: a127211e386065ed96a84eccb86ecd55031f1e1f6c356e5576e9721b4daa325d9d2de62fcce2a47b2278f547f995cda0d4ba4176296a8d908e1c412e69933c0f
-  data.tar.gz: 473c12878270eafa2471c3cee7bd0bbc6f6fcd598a176e244b9a5ef20104529556b48b39a38bc27e9dbe195f549fac1ab8ccb6e279871f241d65471789c4040d
+  metadata.gz: dc885bc0c0ea35ccce8c3062f0d6628f8dbb965f366e44d92592ce11c67b7bd97dee60b65cdf2d0e799320c4a134f98bb15ecbeb3bc51432ef97bf70da65dedb
+  data.tar.gz: 4253bab7736d40e71d42fd1a2e1584e5a2f904f83eb2891b72d354ba5d1e7dcb0c625cbd1e2f4d187578c1efd9ab6ffad4368630aa3632d231cf7d4be9f7baa7

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 # Add dependencies required to use your gem here.
 
 gem 'sidekiq'
-
+gem 'sentry-raven'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
@@ -11,5 +11,4 @@ group :development do
   gem "rdoc"
   gem "bundler"
   gem "jeweler"
-
 end

data/Gemfile.lock

@@ -57,6 +57,8 @@ GEM
     redis-namespace (1.3.0)
       redis (~> 3.0.0)
     semver2 (3.4.2)
+    sentry-raven (2.3.0)
+      faraday (>= 0.7.6, < 1.0)
     sidekiq (2.12.4)
       celluloid (>= 0.14.1)
       connection_pool (>= 1.0.0)
@@ -74,6 +76,7 @@ DEPENDENCIES
   jeweler
   minitest
   rdoc
+  sentry-raven
   sidekiq
 
 BUNDLED WITH

data/README.rdoc

@@ -2,6 +2,8 @@
 
 A tiny sidekiq middleware that silences transient errors.
 
+After version 0.2.0 it is raven-sentry specific.
+
 == Copyright
 
 Copyright (c) 2013 ControlShift Ltd. See LICENSE.txt for

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/metered_raven_error_handler.rb

@@ -0,0 +1,16 @@
+require 'sidekiq'
+require 'raven/integrations/sidekiq'
+
+module SidekiqMeteredExceptions
+  class MeteredRavenErrorHandler < ::Raven::Sidekiq
+    def call(ex, context)
+      retry_count = (context['retry_count'] || (context['job'] && context['job']['retry_count']))
+
+      if retry_count > 1
+        super(ex, context)
+      end
+    end
+  end
+end
+
+

data/lib/sidekiq_metered_exceptions.rb

@@ -1 +1 @@
-require 'middleware'
+require 'metered_raven_error_handler'

data/sidekiq_metered_exceptions.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: sidekiq_metered_exceptions 0.1.1 ruby lib
+# stub: sidekiq_metered_exceptions 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "sidekiq_metered_exceptions".freeze
-  s.version = "0.1.1"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Nathan Woodhull".freeze]
-  s.date = "2017-01-18"
+  s.date = "2017-01-19"
   s.description = "Some exceptions are transient, so notifying an admin is not useful.".freeze
   s.email = "woodhull@gmail.com".freeze
   s.extra_rdoc_files = [
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "lib/middleware.rb",
+    "lib/metered_raven_error_handler.rb",
     "lib/sidekiq_metered_exceptions.rb",
     "sidekiq_metered_exceptions.gemspec",
     "test/helper.rb",
@@ -44,12 +44,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<sidekiq>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<sentry-raven>.freeze, [">= 0"])
       s.add_development_dependency(%q<minitest>.freeze, [">= 0"])
       s.add_development_dependency(%q<rdoc>.freeze, [">= 0"])
       s.add_development_dependency(%q<bundler>.freeze, [">= 0"])
       s.add_development_dependency(%q<jeweler>.freeze, [">= 0"])
     else
       s.add_dependency(%q<sidekiq>.freeze, [">= 0"])
+      s.add_dependency(%q<sentry-raven>.freeze, [">= 0"])
       s.add_dependency(%q<minitest>.freeze, [">= 0"])
       s.add_dependency(%q<rdoc>.freeze, [">= 0"])
       s.add_dependency(%q<bundler>.freeze, [">= 0"])
@@ -57,6 +59,7 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<sidekiq>.freeze, [">= 0"])
+    s.add_dependency(%q<sentry-raven>.freeze, [">= 0"])
     s.add_dependency(%q<minitest>.freeze, [">= 0"])
     s.add_dependency(%q<rdoc>.freeze, [">= 0"])
     s.add_dependency(%q<bundler>.freeze, [">= 0"])

data/test/test_sidekiq_metered_exceptions.rb

@@ -3,24 +3,12 @@ require 'helper'
 class TestSidekiqMeteredExceptions < Minitest::Test
   describe 'middleware' do
     before do
-      @middleware = SidekiqMeteredExceptions::Middleware.new
+      @exception = Exception.new
+      @middleware = SidekiqMeteredExceptions::MeteredRavenErrorHandler.new
     end
 
-    it 'should propagate exception if there is no retry count' do
-      assert_raises(Exception) { @middleware.call('worker', {}, 'queue') { raise Exception.new }}
-    end
-
-    it 'should propagate the exception if the retry count is greater than zero' do
-      assert_raises(Exception) { @middleware.call('worker', {'retry_count' => 1}, 'queue') { raise Exception.new }}
-    end
+    # todo: figure out how to use minitest.
 
-    it 'should not propagate exception if the retry count is zero' do
-      @middleware.call('worker', {'retry_count' => 0}, 'queue') { raise Exception.new }
-    end
-
-    it "should not interfere with successful jobs" do
-      assert( @middleware.call('worker', {'retry_count' =>1}, 'queue') { return true })
-    end
 
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq_metered_exceptions
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Nathan Woodhull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-18 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sentry-raven
+  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: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -97,7 +111,7 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/middleware.rb
+- lib/metered_raven_error_handler.rb
 - lib/sidekiq_metered_exceptions.rb
 - sidekiq_metered_exceptions.gemspec
 - test/helper.rb

data/lib/middleware.rb

@@ -1,13 +0,0 @@
-module SidekiqMeteredExceptions
-  class Middleware
-
-    def call(worker, job, queue)
-      begin
-        yield
-      rescue StandardError => ex
-        # do not notify on the first occurrence of an exception
-        raise(ex) if job['retry_count'] == nil || job['retry_count'] > 0
-      end
-    end
-  end
-end