pipa-monkeyjob 0.1.3 → 0.1.4

data/lib/monkeyjob/broker/active_record.rb

@@ -71,7 +71,7 @@ module Monkey
         synchronize do
           @jobs.delete(cookie.id)
           if cookie.success?
-            JobModel.delete(cookie.id)
+            Monkey.logger.hush { JobModel.delete(cookie.id) }
             Monkey.logger.debug "Deleted job #{cookie}"
           end
         end

data/lib/monkeyjob/runner/fork/rails.rb

@@ -5,10 +5,10 @@ module Monkey
         def run_local(*args)
           super(*args) do
             begin
-              ActiveRecord::Base.dirty_reconnect!
+              ::ActiveRecord::Base.dirty_reconnect!
               yield(*args)
             ensure
-              ActiveRecord::Base.connection_handler.clear_all_connections!
+              ::ActiveRecord::Base.connection_handler.clear_all_connections!
             end
           end
         end
@@ -17,16 +17,12 @@ module Monkey
   end
 end
 
-class Monkey::Runner::Fork::Rails
-  module ActiveRecord
-    module BasePatch
-      def dirty_reconnect!
-        @@connection_handler = ActiveRecord::ConnectionAdapters::ConnectionHandler.new
-        establish_connection
-      end
-    end
+ActiveRecord::Base
+
+class ActiveRecord::Base
+  def self.dirty_reconnect!
+    @@connection_handler = ::ActiveRecord::ConnectionAdapters::ConnectionHandler.new
+    establish_connection
   end
 end
 
-::ActiveRecord::Base.extend Monkey::Runner::Fork::Rails::ActiveRecord::BasePatch
-

data/lib/monkeyjob/runner/fork.rb

@@ -23,19 +23,22 @@ module Monkey
         raise ArgumentError, 'block must be provided' unless block_given?
         pid = fork do
           trap('TERM') do
-            Monkey.logger.warn "Process #{Process.pid} received SIGTERM, will exit!"
+            Monkey.logger.warn "Process #{Process.pid} received SIGTERM, will exit!(2)"
             exit!(2)
           end
-          ActiveRecord::Base.spawn_reconnect
           begin
+            Monkey.logger.debug "Process #{Process.pid} running"
             yield(*args)
+            Monkey.logger.debug "Process #{Process.pid} will exit!"
             exit!(0)
           rescue
             Monkey.logger.error $!
+            Monkey.logger.error "Process #{Process.pid} failed, will exit!(1)"
             exit!(1)
           end
         end
         (spid = Process.detach(pid))[:pid] = pid
+        Monkey.logger.debug "Forked #{pid}"
         spid
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pipa-monkeyjob
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Igor Gunko