protein 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63cf837ff41c8be4608441605bbf5a5c5f45e249
-  data.tar.gz: 72555ef175c6637a367c976de3c2ae69ef4fd237
+  metadata.gz: 7b2d385b542b3564b97860e18f7eb1f00526c2ed
+  data.tar.gz: 6804a4443e61e4c186bf949bb85fb9830fabbf28
 SHA512:
-  metadata.gz: 7311e2ac8421b6c332823732e925e6a64070b1cc59d1417ba90205fd025896cb7d6056c5e839586e49cbf30e21714ad61d800e8122a9c8a3c3bc90e2559ed164
-  data.tar.gz: b235f39f076c6d7e9ecd88bb1958bd82314bee737b0eb479ed4653e91b69c76363ff5003cba6784fa2b9ffc64b1ee86a207e8b911fe3b1cee839a93c8e6b3372
+  metadata.gz: 81de7fe02a5df4411a3d8cf154dc4b38f2d94f2249594b5c8dec201507cfebffb02ae7c1d0486d003974feab5daa4e67ca677e4f5b05ab9db76cc7c8f25c00af
+  data.tar.gz: e0fc17fe57afb3bd2445d29130d495446d8ecb5fee7216fedfc5138a92ee49d8daa2bcdd8835df2e8ed4a261192303b043a76e32e94fb95bd7560ba8c812eae1

data/lib/protein/amqp_adapter.rb

@@ -78,6 +78,8 @@ class AMQPAdapter
 
     def serve(router)
       @conn = Bunny.new(url)
+      @terminating = false
+      @processing = false
       begin
         @conn.start
       rescue Bunny::TCPConnectionFailed => e
@@ -90,11 +92,28 @@ class AMQPAdapter
       @q = @ch.queue(queue)
       @x = @ch.default_exchange
 
+      Signal.trap("TERM") do
+        if @processing
+          @terminating = true
+        else
+          exit
+        end
+      end
+
+      Signal.trap("INT") do
+        if @processing
+          @terminating = true
+        else
+          exit
+        end
+      end
+
       Protein.logger.info "Connected to #{url}, serving RPC calls from #{queue}"
 
       loop do
         begin
           @q.subscribe(block: true, manual_ack: true) do |delivery_info, properties, payload|
+            @processing = true
             begin
               @error = nil
               response = Processor.call(router, payload)
@@ -110,12 +129,16 @@ class AMQPAdapter
             end
 
             @ch.ack(delivery_info.delivery_tag)
+            @processing = false
+            break if @terminating
             if @error
               log_error(@error)
               raise(@error)
             end
           end
         rescue StandardError => e
+          @processing = false
+          break if @terminating
           log_error(e)
           Protein.logger.error "RPC server error: #{e.inspect}, restarting the server in 5s..."
 

data/lib/protein/server.rb

@@ -1,5 +1,3 @@
-require 'parallel'
-
 module Protein
 class Server
   class << self
@@ -29,19 +27,30 @@ class Server
       GetConst.call(@transport_class)
     end
 
+
     def start
       worker_count = config.fetch(:concurrency, 5)
       on_worker_boot = config[:on_worker_boot]
 
-      if worker_count.is_a?(Integer) && worker_count > 1
-        Parallel.each(1..worker_count, in_processes: worker_count) do |worker|
-          Protein.logger.info "Starting server #{worker}/#{worker_count} with PID #{Process.pid}"
+      pids = (1..worker_count).map do |i|
+        fork do
+          Protein.logger.info "Starting server #{i}/#{worker_count} with PID #{Process.pid}"
           on_worker_boot.call if on_worker_boot.respond_to?(:call)
           transport_class.serve(router)
         end
-      else
-        transport_class.serve(router)
       end
+
+      Signal.trap('TERM') do
+        pids.each { |pid| Process.kill(:TERM, pid) }
+        pids.each { |pid| Process.wait(pid) }
+      end
+
+      Signal.trap('INT') do
+        pids.each { |pid| Process.kill(:INT, pid) }
+        pids.each { |pid| Process.wait(pid) }
+      end
+
+      Process.wait
     end
   end
 end

data/lib/protein/version.rb

@@ -1,3 +1,3 @@
 module Protein
-  VERSION = '0.6.0'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protein
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Karol Słuszniak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2019-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -58,20 +58,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: parallel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 description: 
 email: karol@shedul.com
 executables: []