add before_event

kostya · May 29, 2015 · 258eb0c · 258eb0c
1 parent 0be581e
commit 258eb0c
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/lib/pgq/consumer.rb b/lib/pgq/consumer.rb
@@ -16,7 +16,12 @@ def self.add_event(method_name, *args)
 
   # == magick consume
 
+  def before_event(method_name, *args)
+    # just callback, redefine if needed
+  end
+
   def perform(method_name, *args)
+    self.before_event(method_name, *args)
     self.send(method_name, *args)
   end
 

diff --git a/lib/pgq/consumer_base.rb b/lib/pgq/consumer_base.rb
@@ -120,11 +120,7 @@ def perform_event(event)
 
     perform(type, *data)
 
-  rescue Exception => ex
-    error(event.exception_message(ex))
-    event.failed!(ex)
-
-  rescue => ex
+  rescue Object => ex
     error(event.exception_message(ex))
     event.failed!(ex)
   end

diff --git a/spec/consumer_spec.rb b/spec/consumer_spec.rb
@@ -39,5 +39,10 @@
     $a.should == 111
     $b.should == 'abc'
   end
-
+
+  it "before_event" do
+    PgqCallback.proxy(:bla)
+    PgqCallback.bla(111)
+    $x.should == 123
+  end
 end
diff --git a/spec/support/spec_support.rb b/spec/support/spec_support.rb
@@ -31,6 +31,16 @@ def ptest2(a, b)
 
 end
 
+class PgqCallback < Pgq::Consumer
+  def before_event(method_name, *args)
+    @x = 12
+  end
+
+  def bla(x)
+    $x = x + @x
+  end
+end
+
 def start_ticker
   conf = "#{ENV['RAILS_ROOT']}/config/pgq_#{ENV['RAILS_ENV']}.ini"
   output = `which pgqadm.py && pgqadm.py #{conf} -d ticker 2>&1 || which pgqadm && pgqadm #{conf} -d ticker 2>&1`