bushpig 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc9bf6fabf6038b858a576750b32c827ad7095bca278de9bf1ae207258fd0c94
-  data.tar.gz: 36be95562838f7868ccc13d76a5e4b77bc75220f18f19693e2fee001d710e21b
+  metadata.gz: 8d3c78ffe7777e02a7e1a7d4f4e1838ab47c80a5c9d0c1d61e6547c2b956065f
+  data.tar.gz: 64bc3d1e149b54e84a28e9f637b9495b7a6e9d7eec451304e310afd8bb473067
 SHA512:
-  metadata.gz: cd5f62fdff7ace18ffac4ba7332d29f68a53debeda49f155fe784fe3ff14f2e70ef07cf26623087d134ae7c8e361cd8fe2536afb9f135d05716f850680ae255b
-  data.tar.gz: f90b3ba40eb138d0e9a589d9d47f727218761f0a4cc8e022da0fce3395894cd50415f15349cf421a3995a56ecc08582bbe6a9b6b47ea79b1288bbce41e4c5fbe
+  metadata.gz: 9a1ca507019ef95f735f9b0558d1b4867fccec40a6fac62ced66f69d0ab57168a081af14dd661876221213c92e3c184393dabedefe8f706a1a12aa6354955bdd
+  data.tar.gz: 7148a4dabeff3df6575b455a08306342d9b488938593841882ed025e1f7a6fcbb35d22c5f29554a2269c78f3aa853808c84570d889aca8fadcac55ef5a362ec7

data/Gemfile.lock

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

data/gemset.nix

@@ -186,7 +186,7 @@
       path = ./.;
       type = "path";
     };
-    version = "0.1.6";
+    version = "0.1.7";
   };
   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

@@ -19,10 +19,10 @@ module Bushpig
     end
 
     def submit(queue, job, score: default_score, ttl: default_ttl)
-      @callback.call(job)
+      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

@@ -16,8 +16,12 @@ 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
       end
     end
@@ -27,24 +31,30 @@ module Bushpig
         @@unique_key = unique_key
 
         def job_id
+          @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
       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

@@ -48,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
@@ -70,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
@@ -80,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
@@ -88,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.6'
+  VERSION = '0.1.7'
 end

metadata

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