disc 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0081b227e9f7794ea8651ef2966b223c72a0fe6b
-  data.tar.gz: a448cd19e5f8a3b15c177cbd5a75159de298fecb
+  metadata.gz: bf220b91a7f56d811b3926018f82fcf65e35956d
+  data.tar.gz: 64c8e523ed22e996a54b31da8f2b077c08b6ff7d
 SHA512:
-  metadata.gz: 3c77f98a2e0a805beeb9996c8b14e1d529ea99cec467c895df4409bfc111b976f4924d4248793ba64cba772557dc2e57a4b01df8a430e88e38e412d4fcaa0911
-  data.tar.gz: dda30cd643665212bf5649a147d899a6ffcd9191b2a12e0ce8b219791205f340462b89220c8c1127737c28fb1c3571bdd7aea3f66337af0c77c049029147dbf0
+  metadata.gz: 6045fb0e6e7aaf39812feada1334c6dc288f4f6eef5d0e7f901e80d577a353c70e8b1b4e7a0df51faa5c52980b4a5dbcd7d5c415bdb2dbe56e137b9077de53ab
+  data.tar.gz: 0e4fe719be855badefeb2aa726d61240f5908b62b383afaf4586ab1df0cd5864f1aec02c081ba4319a1fff2b79ba5ae41c918142388fefe03fce69fac711314a

data/README.md

@@ -111,7 +111,7 @@ default.
 
 ## Rails and ActiveJob integration
 
-Disc has an [ActiveJob](http://edgeguides.rubyonrails.org/active_job_basics.html) adapter, which you can use very easily:
+You can use Disc easily in Rails without any more hassle, but if you'd like to use it via [ActiveJob](http://edgeguides.rubyonrails.org/active_job_basics.html) you can use the adapter included in this gem.
 
 ```ruby
 # Gemfile
@@ -142,7 +142,7 @@ CluJob.perform_later(a_bunch_of_arguments)
 As always, make sure your `disc_init.rb` file requires the necessary jobs and you'll be good to go!
 
 
-## A note on stability.
+## A note on stability
 
 The version of Disque at the time of this writing is `0.0.1`. It is a wonderful project, I know of people running it in production, and I expect it will only get better and better with time, but please do not expect Disc to be more production ready than Disque is, Disque still gives me the occasional segfault when running Disc's test suite.
 

data/examples/echoer.rb

@@ -2,7 +2,7 @@ require 'disc'
 
 class Echoer
   include Disc::Job
-  disc queue: 'test_urgent'
+  disc queue: 'test'
 
   def perform(first, second, third)
     puts "First: #{ first }, Second: #{ second }, Third: #{ third }"

data/examples/failer.rb

@@ -0,0 +1,16 @@
+require 'disc'
+
+def Disc.on_error(exception, job)
+  $stdout.puts('<insert error reporting here>')
+  $stdout.puts(exception.message)
+  $stdout.puts(job)
+end
+
+class Failer
+  include Disc::Job
+  disc queue: 'test'
+
+  def perform(string)
+    raise string
+  end
+end

data/lib/disc/version.rb

@@ -1,3 +1,3 @@
 class Disc
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

data/lib/disc.rb

@@ -72,12 +72,11 @@ class Disc
         Array(jobs).each do |queue, msgid, serialized_job|
           begin
             job = MessagePack.unpack(serialized_job)
-            job.update('id' => msgid, 'queue' => queue)
             instance = Object.const_get(job['class']).new
             instance.perform(*job['arguments'])
             disque.call('ACKJOB', msgid)
           rescue => err
-            Disc.on_error(err, job)
+            Disc.on_error(err, job.update('id' => msgid, 'queue' => queue))
           end
         end
       end

data/test/disc_test.rb

@@ -6,13 +6,29 @@ require 'pty'
 require_relative '../examples/echoer'
 # class Echoer
 #   include Disc::Job
-#   disc queue: 'test_urgent'
+#   disc queue: 'test'
 #
 #   def perform(first, second, third)
 #     puts "First: #{ first }, Second: #{ second }, Third: #{ third }"
 #   end
 # end
 
+require_relative '../examples/failer'
+# def Disc.on_error(exception, job)
+#   $stdout.puts('<insert error reporting here>')
+#   $stdout.puts(exception.message)
+#   $stdout.puts(job)
+# end
+#
+# class Failer
+#   include Disc::Job
+#   disc queue: 'test'
+# 
+#   def perform(string)
+#     raise string
+#   end
+# end
+
 prepare do
   Disc.disque.call('DEBUG', 'FLUSHALL')
 end
@@ -21,7 +37,7 @@ scope do
   test 'jobs are enqueued to the correct Disque queue with appropriate parameters and class' do
     jobid = Echoer.enqueue('one argument', { random: 'data' }, 3)
 
-    jobs = Array(Disc.disque.fetch(from: ['test_urgent'], timeout: Disc.disque_timeout, count: 1))
+    jobs = Array(Disc.disque.fetch(from: ['test'], timeout: Disc.disque_timeout, count: 1))
     assert jobs.any?
     assert_equal 1, jobs.count
 
@@ -46,20 +62,20 @@ scope do
     in_3_seconds = (Time.now + 3).to_datetime
     jobid = Echoer.enqueue_at(in_3_seconds, 'one argument', { random: 'data' }, 3)
 
-    jobs = Array(Disc.disque.fetch(from: ['test_urgent'], timeout: Disc.disque_timeout, count: 1))
+    jobs = Array(Disc.disque.fetch(from: ['test'], timeout: Disc.disque_timeout, count: 1))
     assert jobs.empty?
 
     sleep 1
-    jobs = Array(Disc.disque.fetch(from: ['test_urgent'], timeout: Disc.disque_timeout, count: 1))
+    jobs = Array(Disc.disque.fetch(from: ['test'], timeout: Disc.disque_timeout, count: 1))
     assert jobs.empty?
 
     sleep 2
-    jobs = Array(Disc.disque.fetch(from: ['test_urgent'], timeout: Disc.disque_timeout, count: 1))
+    jobs = Array(Disc.disque.fetch(from: ['test'], timeout: Disc.disque_timeout, count: 1))
     assert jobs.any?
     assert_equal 1, jobs.size
 
     jobs.first.tap do |queue, id, serialized_job|
-      assert_equal 'test_urgent', queue
+      assert_equal 'test', queue
       assert_equal jobid, id
       job = MessagePack.unpack(serialized_job)
       assert job.has_key?('class')
@@ -74,11 +90,11 @@ scope do
       Echoer.enqueue('one argument', { random: 'data' }, 3)
 
       cout, _, pid = PTY.spawn(
-        'QUEUES=test_urgent ruby -Ilib bin/disc -r ./examples/echoer'
+        'QUEUES=test ruby -Ilib bin/disc -r ./examples/echoer'
       )
       sleep 0.5
 
-      jobs = Disc.disque.fetch(from: ['test_urgent'], timeout: Disc.disque_timeout, count: 1)
+      jobs = Disc.disque.fetch(from: ['test'], timeout: Disc.disque_timeout, count: 1)
       assert jobs.nil?
 
       matched = false
@@ -94,4 +110,45 @@ scope do
       Process.kill("KILL", pid)
     end
   end
+
+  test 'Disc.on_error will catch unhandled exceptions and keep disc alive' do
+    begin
+      Failer.enqueue('this can only end positively')
+
+      cout, _, pid = PTY.spawn(
+        'QUEUES=test ruby -Ilib bin/disc -r ./examples/failer'
+      )
+      sleep 0.5
+
+      jobs = Disc.disque.fetch(from: ['test'], timeout: Disc.disque_timeout, count: 1)
+      assert jobs.nil?
+
+      counter = 0
+      tasks = {
+        reported_error: false,
+        printed_message: false,
+        printed_job: false
+      }
+
+      while tasks.values.include?(false) && counter < 10
+        counter += 1
+        output = cout.gets
+
+        tasks[:reported_error] = true   if output.match(/<insert error reporting here>/)
+        tasks[:printed_message] = true  if output.match(/this can only end positively/)
+        tasks[:printed_job] = true      if output.match(/Failer/)
+      end
+
+      assert !tasks.values.include?(false)
+
+      begin
+        Process.getpgid(pid)
+        assert true
+      rescue Errno::ESRCH
+        assert false
+      end
+    ensure
+      Process.kill("KILL", pid)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disc
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - pote
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-17 00:00:00.000000000 Z
+date: 2015-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: disque
@@ -71,7 +71,7 @@ files:
 - disc.gemspec
 - examples/disc_init.rb
 - examples/echoer.rb
-- examples/fail_job.rb
+- examples/failer.rb
 - examples/greeter.rb
 - lib/active_job/queue_adapters/disc_adapter.rb
 - lib/disc.rb

data/examples/fail_job.rb

@@ -1,10 +0,0 @@
-require 'disc'
-
-class FailJob
-  include Disc::Job
-  disc queue: 'test_medium'
-
-  def perform(string)
-    raise string
-  end
-end