bushpig 0.1.7 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d3c78ffe7777e02a7e1a7d4f4e1838ab47c80a5c9d0c1d61e6547c2b956065f
-  data.tar.gz: 64bc3d1e149b54e84a28e9f637b9495b7a6e9d7eec451304e310afd8bb473067
+  metadata.gz: 74a53f240f755c6d98d37f2790ac903fb3b6fd2b2470341c2dc357579605f51e
+  data.tar.gz: ddfc8337f32005071b941ea1dd6e1e1599fb7b27a8c2b3e72b941c95be26d25a
 SHA512:
-  metadata.gz: 9a1ca507019ef95f735f9b0558d1b4867fccec40a6fac62ced66f69d0ab57168a081af14dd661876221213c92e3c184393dabedefe8f706a1a12aa6354955bdd
-  data.tar.gz: 7148a4dabeff3df6575b455a08306342d9b488938593841882ed025e1f7a6fcbb35d22c5f29554a2269c78f3aa853808c84570d889aca8fadcac55ef5a362ec7
+  metadata.gz: cb792068441f32529b3075a9972a7f96c09cdcd64649dfa3d9a145e9bfb77502e85841ec9526a9612073a6d44b9f5f83951c0a458ce790ee0afe82330548a8d5
+  data.tar.gz: 578ab0ac3b7e9a69a8be8cd5df311caea42824267cfb44960b9519fe22015c56156b024082d8dd9e6d7e13bc949e54bce4357f21ff1420b7a6d3da31d4bbcadc

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    bushpig (0.1.7)
+    bushpig (0.1.12)
       connection_pool (~> 2.2)
       json (>= 1.8)
       redis (~> 3.3)

data/gemset.nix

@@ -186,7 +186,7 @@
       path = ./.;
       type = "path";
     };
-    version = "0.1.7";
+    version = "0.1.12";
   };
   coderay = {
     groups = ["default" "development"];

data/lib/bushpig/job.rb

@@ -6,8 +6,14 @@ require 'json'
 
 module Bushpig
   module Job
-    def self.job(*args)
+    def self.job(handler, *args)
       Struct.new(*args) do
+        @job_handler = handler
+
+        def self.job_handler
+          @job_handler
+        end
+
         def job_id
           @job_id ||= SecureRandom.hex(32)
         end
@@ -23,12 +29,25 @@ module Bushpig
         def job_payload
           JSON.generate({ class: self.class.name, id: job_id, args: each.to_a })
         end
+
+        def handle
+          self.class.job_handler.call(self)
+        end
       end
     end
 
-    def self.keyed(unique_key, *args)
+    def self.keyed(handler, unique_key, *args)
       Struct.new(*args) do
-        @@unique_key = unique_key
+        @job_handler = handler
+        @unique_key = unique_key
+
+        def self.job_handler
+          @job_handler
+        end
+
+        def self.job_unique_key
+          @unique_key
+        end
 
         def job_id
           @job_id ||= SecureRandom.hex(32)
@@ -39,7 +58,7 @@ module Bushpig
         end
 
         def job_key
-          @@unique_key.inject(Digest::SHA256.new) do |digest, key|
+          self.class.job_unique_key.inject(Digest::SHA256.new.update(self.class.name)) do |digest, key|
             digest.update(self[key].to_s)
           end.hexdigest
         end
@@ -47,6 +66,10 @@ module Bushpig
         def job_payload
           JSON.generate({ class: self.class.name, id: job_id, args: each.to_a })
         end
+
+        def handle
+          self.class.job_handler.call(self)
+        end
       end
     end
 

data/lib/bushpig/server.rb

@@ -37,7 +37,10 @@ module Bushpig
 
       until @done
         job = fetch(queue)
-        next if job.nil?
+        if job.nil?
+          ActiveRecord::Base.clear_active_connections!
+          next
+        end
 
         handle(job)
         complete(job)
@@ -59,6 +62,7 @@ module Bushpig
       elapsed = finished - started
       puts "Job raised exception: jid-#{job.job_id} #{elapsed} seconds: #{e}"
       notify_exception(job, e)
+      ActiveRecord::Base.clear_active_connections!
     end
 
     def honeybadger

data/lib/bushpig/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bushpig
-  VERSION = '0.1.7'
+  VERSION = '0.1.12'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bushpig
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.12
 platform: ruby
 authors:
 - Shaun Sharples