bushpig 0.1.4 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c75a2936af84505177c5cd6f439e8e0a482eaf2f186e984b40272131af09abc
-  data.tar.gz: 05575e010e390a949969d649d9e66c46011c95e84ad9940cbe051c8fd1b2c19d
+  metadata.gz: 75f414bd5b386fdcd5d452374ab9d6f1076e59353e6a08416cd710f8119f0b9b
+  data.tar.gz: 91cca09ccea7aa3b9169d15fe8174d16312892c8db7668408f0c594afcdcaef2
 SHA512:
-  metadata.gz: 23d1ed290ad2df8c4ba1f17099cc7c858bccce7052b64779009e938707c40f70050003e44b24cba20086c757f26bddd41f1141841c566f4f44ec2074df649b17
-  data.tar.gz: 51b8ab6e67249f1a703103af8405f07e3871d42bb1a7c10c42326fdf73542c8fa05f3b027ec59f5328d11d3b31ce512eef09d54ce18e9ccb845a3e18f8ceb42f
+  metadata.gz: af10ea043bc302564ac0430b3531624c3d65b9c15cfc0e81e48f3cce9df314219b63c3bc1354de308420a6dd61d151858a9dcea1b9d999cdd23c201e9c12bcf3
+  data.tar.gz: e45960eddf67527a28203e73c7805b14cdfd7fc0399fac5b18d99833ee1d9d054794d437fb30c69c1c6b405a910127d2118d1d8bc9a92839c9a28404ad9e4e2e

data/Gemfile.lock

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

data/gemset.nix

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

data/lib/bushpig.rb

@@ -43,11 +43,11 @@ module Bushpig
     defined?(Bushpig::CLI)
   end
 
-  def self.set_key(queue)
+  def self.queue_key(queue)
     "set:#{queue}"
   end
 
-  def self.job_key(job_id)
-    "job:#{job_id}"
+  def self.job_key(job_key)
+    "job:#{job_key}"
   end
 end

data/lib/bushpig/client.rb

@@ -4,9 +4,10 @@ module Bushpig
   class Client
     attr_accessor :default_ttl
 
-    def initialize(pool)
+    def initialize(pool, &callback)
       @pool = pool
       @default_ttl = nil
+      @callback = callback
     end
 
     def redis_pool
@@ -18,9 +19,10 @@ module Bushpig
     end
 
     def submit(queue, job, score: default_score, ttl: default_ttl)
+      modified = @callback.call(job)
       redis_pool.with do |conn|
-        conn.set(Bushpig.job_key(job.job_id), job.job_payload, ex: ttl)
-        conn.zadd(Bushpig.set_key(queue), score, job.job_id)
+        conn.set(Bushpig.job_key(modified.job_key), modified.job_payload, ex: ttl)
+        conn.zadd(Bushpig.queue_key(queue), score, modified.job_key)
       end
     end
   end

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
@@ -16,35 +22,58 @@ module Bushpig
           @job_id = job_id
         end
 
+        def job_key
+          job_id
+        end
+
         def job_payload
-          JSON.generate({ class: self.class.name, args: each.to_a })
+          JSON.generate({ class: self.class.name, id: job_id, args: each.to_a })
+        end
+
+        def call(job)
+          self.class.job_handler.call(job)
         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 job_id
-          @@unique_key.inject(Digest::SHA256.new) do |digest, key|
+          @job_id ||= SecureRandom.hex(32)
+        end
+
+        def job_id=(job_id)
+          @job_id = job_id
+        end
+
+        def job_key
+          @unique_key.inject(Digest::SHA256.new) do |digest, key|
             digest.update(self[key].to_s)
           end.hexdigest
         end
 
-        def job_id=(job_id); end
-
         def job_payload
-          JSON.generate({ class: self.class.name, args: each.to_a })
+          JSON.generate({ class: self.class.name, id: job_id, args: each.to_a })
+        end
+
+        def call(job)
+          self.class.job_handler.call(job)
         end
       end
     end
 
-    def self.hydrate(job_id, job_payload)
+    def self.hydrate(job_payload)
       h = JSON.parse(job_payload, symbolize_names: true)
       klass = const_get(h[:class])
       job = klass.new(*h[:args])
-      job.job_id = job_id
+      job.job_id = h[:id]
       job
     end
   end

data/lib/bushpig/server.rb

@@ -19,10 +19,16 @@ module Bushpig
         puts 'INT received, shutdown flagged'
         @done = true
       end
+      Signal.trap('TERM') do
+        reset_signals
+        puts 'TERM received, shutdown flagged'
+        @done = true
+      end
     end
 
     def reset_signals
       Signal.trap('INT', 'DEFAULT')
+      Signal.trap('TERM', 'DEFAULT')
     end
 
     def serve(queue)
@@ -42,7 +48,7 @@ module Bushpig
     end
 
     def handle(job)
-      puts "Job starting: jid-#{job.job_id} #{job}"
+      puts "Job starting: jid-#{job.job_id} jkey-#{job.job_key} #{job}"
       started = monotonic_time
       @handler.call(job)
       finished = monotonic_time
@@ -64,7 +70,7 @@ module Bushpig
     end
 
     def notify_exception(job, exception)
-      honeybadger&.notify(exception, context: { job_id: job.job_id, job: job.to_s })
+      honeybadger&.notify(exception, context: { job_id: job.job_id, job_key: job.job_key, job: job.to_s })
     end
 
     def monotonic_time
@@ -74,7 +80,7 @@ module Bushpig
     def fetch(queue)
       redis_pool.with do |conn|
         begin
-          res = conn.bzpopmin(Bushpig.set_key(queue), @timeout)
+          res = conn.bzpopmin(Bushpig.queue_key(queue), @timeout)
         rescue Redis::TimeoutError
           # TODO: warn user (once) that redis timeout set lower than pop timeout
           conn.close
@@ -82,20 +88,20 @@ module Bushpig
         end
         return nil if res.nil?
 
-        (_set, jid, _score) = res
-        # conn.sadd('running', jid)
+        (_set, key, _score) = res
+        # conn.sadd('running', key)
 
-        payload = conn.get(Bushpig.job_key(jid))
+        payload = conn.get(Bushpig.job_key(key))
         return nil if payload.nil? # most likely job expired
 
-        Bushpig::Job.hydrate(jid, payload)
+        Bushpig::Job.hydrate(payload)
       end
     end
 
     def complete(job)
       redis_pool.with do |conn|
-        # conn.srem('running', job.job_id)
-        conn.del(Bushpig.job_key(job.job_id))
+        # conn.srem('running', job.job_key)
+        conn.del(Bushpig.job_key(job.job_key))
       end
     end
   end

data/lib/bushpig/version.rb

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

metadata

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