lib/qs/qs_runner.rb in qs-0.5.0 vs lib/qs/qs_runner.rb in qs-0.6.0

@@ -13,25 +13,21 @@
       @timeout = handler_class.timeout || Qs.config.timeout
     end
 
     def run
       OptionalTimeout.new(self.timeout) do
-        run_callbacks self.handler_class.before_callbacks
-        self.handler.init
-        self.handler.run
-        run_callbacks self.handler_class.after_callbacks
+        self.handler.qs_run_callback 'before'
+        self.handler.qs_init
+        self.handler.qs_run
+        self.handler.qs_run_callback 'after'
       end
     rescue TimeoutError => exception
       error = TimeoutError.new "#{handler_class} timed out (#{timeout}s)"
       error.set_backtrace(exception.backtrace)
       raise error
     end
 
     private
-
-    def run_callbacks(callbacks)
-      callbacks.each{ |proc| self.handler.instance_eval(&proc) }
-    end
 
     module OptionalTimeout
       def self.new(timeout, &block)
         if !timeout.nil?
           SystemTimer.timeout_after(timeout, TimeoutError, &block)