multiple_man 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c8569fbeb2332b746b624b89ca693b82fafbbbd8
-  data.tar.gz: 22546e311063337f0570896f2ed40387547a6135
+  metadata.gz: 34c76ed50d75d8813d5bfb120ed9b18bdaccaec1
+  data.tar.gz: 29ce2ff4cd58a046a7f5a4dae146ae73412e4030
 SHA512:
-  metadata.gz: 9ca8387c22e2ca8665d4cf90f5e990dea472d7a46b1a448540e8adb01af6d8c759c358c2ca5505e1005a03e49aba257cd5df6fb93d050e0478211881318e3736
-  data.tar.gz: 0e022910a4b70baea88d04092bebabbbf4b90a7a34cc34f7c2e1d013d5d85d9e34aca2569eb4bba0e747520da1a4d6e94fd45b36e425575bb3c096db72f257b9
+  metadata.gz: 9f6e04e9f08b36cff2353c38d065a206169536852b409b70091dd2054bf40e1d198da9a8f8aa4525569570562a551164fcde4ad109da23db6e577c83f0ae01ad
+  data.tar.gz: 9792ce4da51bc92d5e3f65d803d4bce5e0abb1061bf6cf96104a2a3fc119ec7718def7eb853e542299fddc475e5c6eb1c678b6e64b7d4b2dcd687d043b824a18

data/lib/multiple_man/runner.rb

@@ -13,6 +13,7 @@ module MultipleMan
     end
 
     def run
+      trap_signals!
       preload_framework!
       channel.prefetch(prefetch_size)
       build_listener.listen
@@ -24,6 +25,18 @@ module MultipleMan
 
     def_delegators :config, :prefetch_size, :queue_name, :listeners, :topic_name
 
+    def trap_signals!
+      handler = proc do |signal|
+        puts "received #{Signal.signame(signal)}"
+        channel.close
+        connection.close
+
+        exit
+      end
+
+      %w(INT QUIT TERM).each { |signal| Signal.trap(signal, handler) }
+    end
+
     def preload_framework!
       Rails.application.eager_load! if defined?(Rails)
       if defined?(Hanami)
@@ -61,7 +74,11 @@ module MultipleMan
     end
 
     def channel
-      @channel ||= Connection.connection.create_channel
+      @channel ||= connection.create_channel
+    end
+
+    def connection
+      Connection.connection
     end
 
     def config

data/lib/multiple_man/version.rb

@@ -1,3 +1,3 @@
 module MultipleMan
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/spec/runner_spec.rb

@@ -8,10 +8,33 @@ describe MultipleMan::Runner do
   it 'boots app and listens on new channel' do
     expect(MultipleMan::Connection).to receive(:connection).and_return(mock_connection)
     expect(MultipleMan::Consumers::General).to receive(:new).and_return(mock_consumer)
-
     expect(mock_consumer).to receive(:listen)
 
     runner = described_class.new(mode: :general)
     runner.run
   end
+
+  context "shutdown" do
+    let(:mock_consumer) { double("Consumer", listen: ->(_){ sleep(1); raise "no interrupt!" }) }
+
+    xit 'closes connections and exits gracefully' do
+      ps = fork do
+        expect(MultipleMan::Connection).to receive(:connection).and_return(mock_connection)
+        expect(MultipleMan::Consumers::General).to receive(:new).and_return(mock_consumer)
+
+        expect(mock_channel).to receive(:close)
+        expect(mock_connection).to receive(:close)
+
+        described_class.new(mode: :general).run
+      end
+
+      sleep 0.01
+
+      Process.kill('INT', ps)
+      a, status = Process.waitpid2(ps)
+      # binding.pry
+
+      expect(status.success?).to be true
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: multiple_man
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Ryan Brunner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: MultipleMan syncs changes to ActiveRecord models via AMQP