r_proxy 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d037d1602ec7e506e092afc420294d16226a968733bb966dd3def1c84b539e36
-  data.tar.gz: feb0fe63e0d1126e601f100aa00c93d3a8ead3b8fd8dce870d103f12e445f5f1
+  metadata.gz: 9f0065ab65442af3554629362b7ba10f12e247a4b81c53ededc545c381b4d5e8
+  data.tar.gz: 3882a0ec3c594581970a7db9cca5a79056563bc2d64dfa7bed91495724c903eb
 SHA512:
-  metadata.gz: 1756dc3c88ae2fa70031654f102bfbd1519e453e375950ac718d141ec7ae7ce0a11922030d38b0a9be380144e0bb29efbd5d8f49778d359abeb8dcf1305e5984
-  data.tar.gz: 54c20c979bc70a713c92d1ca66398c0589624e3f87df59afa9eb2fe6ff58c398051c441fe17bdfb315c44abfe8abeb76ea9560d260f300550c3367d1f6b71a53
+  metadata.gz: 0a53bd67b6d97a735a0cfc4d1a3b836f54ec6aa41301b5d450905f09612b0374dd52ea29e173873048fa1242439fa7025c1a60c89e25eab6d7231d7e6ad1846a
+  data.tar.gz: 867cd29058afb86b28aa7d45d9e30c1f6d2b5f5c16c806464de9e3388f30048bc6008943331f7c0cd87ac4b89d855a7f5a0b9014e7e56497cd34e360943e0d5d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    r_proxy (0.2.0)
+    r_proxy (0.2.3)
       eventmachine (~> 1.2, >= 1.2.7)
       redis (~> 4.1, >= 4.1.4)
 

data/lib/r_proxy.rb

@@ -11,7 +11,6 @@ require 'r_proxy/http_proxy_parser'
 require 'r_proxy/redis_service'
 
 require 'r_proxy/master_process'
-require 'r_proxy/process_handler'
 
 require 'r_proxy/target_connection'
 require 'r_proxy/connection_handler'

data/lib/r_proxy/master_process.rb

@@ -8,6 +8,9 @@ module RProxy
     def initialize
       @config = RProxy::Config.new
       @pids = []
+      @watchers = []
+      @watcher_status = true
+      @mutex = Mutex.new
     end
 
     def set(name, value)
@@ -15,64 +18,79 @@ module RProxy
     end
 
     def run!
+      Signal.trap("TERM") { exit }
       at_exit { stop_all_process }
       @logger = @config.logger
       begin
         start_r_proxy
       rescue Interrupt
-        @logger.info('existing all process....') if @logger
-        EventMachine.stop_event_loop if EventMachine.reactor_running?
+        exit
       rescue => e
-        @logger.info("master process exit with #{e.message}, #{e.backtrace}") if @logger
-        EventMachine.stop_event_loop if EventMachine.reactor_running?
+        @logger.info("master process error: #{e.message}, #{e.backtrace}") if @logger
+        exit
       end
     end
 
     private
 
     def stop_all_process
+      @watcher_status = false
       @pids.each do |pid|
         next unless pid
         Process.kill("TERM", pid)
       end
+      @watchers.each { |t| t.join }
+      @logger.info('all process exited....') if @logger
     end
 
-    def start_r_proxy
 
-      instance_amount = @config.instances
-      server = TCPServer.new(@config.host, @config.port)
-      instance_amount.times do
-        pid =  Process.fork do
-          timestamp = (Time.now.to_f * 1000).round
-          begin
-            @logger.info("r_proxy @#{timestamp} process start....") if @logger
-            RProxy::ProxyServer.new(server, @config, timestamp).run!
-          rescue Interrupt
-            @logger.info("r_proxy TPC server instance @#{timestamp} closed now....") if @logger
-          rescue => e
-            @logger.error("instance @#{timestamp}, error: #{e.message}, #{e.backtrace}") if @logger
-            exit!(false)
-          end
+    def spawn_sub_process(server)
+      pid =  Process.fork do
+        timestamp = (Time.now.to_f * 1000).round
+        begin
+          @logger.info("r_proxy @#{timestamp} process start....") if @logger
+          RProxy::ProxyServer.new(server, @config, timestamp).run!
+        rescue Interrupt, SystemExit
+          @logger.info("r_proxy TPC server instance @#{timestamp} closed now....") if @logger
+        rescue => e
+          @logger.error("instance @#{timestamp}, error: #{e.message}, #{e.backtrace}") if @logger
+          exit(false)
+        end
+      end
+      pid
+    end
+
+    def exec_with_watcher(server)
+      @watchers << Thread.fork do
+        while @watcher_status
+          pid = spawn_sub_process(server)
+          push_pids(pid)
+          Process.waitpid(pid, 0)
+          remove_pid(pid)
         end
+      end
+    end
 
-        Process.detach(pid)
+    def push_pids(pid)
+      @mutex.synchronize do
         @pids << pid
-        sleep(0.1)
       end
+    end
 
-      if EventMachine.kqueue?
-        EventMachine.kqueue=(true)
+    def remove_pid(pid)
+      @mutex.synchronize do
+        @pids.delete(pid)
       end
-      EventMachine.run do
-        @pids.each do |pid|
-          EventMachine.watch_process(pid,
-                                     RProxy::ProcessHandler,
-                                     @pids,
-                                     @config,
-                                     server,
-                                     pid)
-        end
+    end
+
+    def start_r_proxy
+      instance_amount = @config.instances
+      server = TCPServer.new(@config.host, @config.port)
+      instance_amount.times do
+        exec_with_watcher(server)
+        sleep(0.1)
       end
+      sleep
     end
   end
 end

data/lib/r_proxy/version.rb

@@ -1,3 +1,3 @@
 module RProxy
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r_proxy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Nick An
@@ -78,7 +78,6 @@ files:
 - lib/r_proxy/http_post_template.rb
 - lib/r_proxy/http_proxy_parser.rb
 - lib/r_proxy/master_process.rb
-- lib/r_proxy/process_handler.rb
 - lib/r_proxy/proxy_server.rb
 - lib/r_proxy/redis_service.rb
 - lib/r_proxy/target_connection.rb

data/lib/r_proxy/process_handler.rb

@@ -1,39 +0,0 @@
-module RProxy
-  class ProcessHandler < EventMachine::ProcessWatch
-
-    def initialize(pids, config, socket, pid)
-      @pids = pids
-      @id = pid
-      @config = config
-      @socket = socket
-      @logger = config.logger
-    end
-
-    def process_exited
-
-      @pids.delete(@id)
-      pid = Process.fork do
-        timestamp = (Time.now.to_f * 1000).round
-        begin
-          @logger.info("r_proxy rebuild new instance replace @#{timestamp}....") if @logger
-          RProxy::ProxyServer.new(@socket, @config, timestamp).run!
-        rescue Interrupt
-          @logger.info("r_proxy TPC server instance @#{timestamp} closed now....") if @logger
-        rescue => e
-          @logger.error("instance @#{timestamp}, error: #{e.message}, #{e.backtrace}") if @logger
-          exit(false)
-        end
-      end
-
-      Process.detach(pid)
-      @pids << pid
-
-      EventMachine.watch_process(pid, RProxy::ProcessHandler,
-                                 @pids,
-                                 @config,
-                                 @socket,
-                                 pid)
-      close_connection
-    end
-  end
-end