totoro 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3929c8c45b8360798af1fea6b612d0ace57159f55cd891fa441936198568d419
-  data.tar.gz: 9240cee71f9715f1dbd939432ec2def7c7747e23b9114a5a58303f7d06e53dbd
+  metadata.gz: 8c2cde32d01379552d09b7e6e8daee1cb2863b143589abce656bc651495f4049
+  data.tar.gz: f4cee462e59f407cd999d3822ac3697e16ba55ddb551296f12055617bc583df6
 SHA512:
-  metadata.gz: bd672cbaee2ba1ea655ac0a31d3271b57a459daa4d9a4101f7a07a8b8149cdbc5f9fa7272737bcecd4966c6c0c2469ef9cb0fa9ad579c45a443523aabccadff7
-  data.tar.gz: 042add5f5d2c90f14da7f5a61b530dc891328539018e2481c5f35510f31580b896e629831db9139322455471763ef0c40233b76d6201413942c79d060df59ab5
+  metadata.gz: 69584e24ac3891412fe36c73fce095af69d180492e17572ef2f6f14ab19db5212a07cdcf5a42e11bff4d7eedf4e7558da2f011aad99b5bed5263138c4bce25c4
+  data.tar.gz: 24b5d356315403a5b755ea85a2b216f4d7084a9294b9a43b90ac06b9ee24c8f4afe3da34a6b5e90c417f46f8277c03934712fab1c59c234f52947e5fdf287534

data/lib/totoro/base_queue.rb

@@ -29,15 +29,9 @@ module Totoro
         Rails.logger.info "send message to #{queue.name}"
         STDOUT.flush
       rescue Bunny::TCPConnectionFailedForAllHosts,
+             Bunny::NetworkErrorWrapper,
              AMQ::Protocol::EmptyResponseError => error
-        Rails.logger.error error.message
-        Rails.logger.info 'Add failed message to resend list'
-        STDOUT.flush
-        Totoro::TotoroFailedMessage.create(
-          class_name: to_s,
-          queue_id: id,
-          payload: payload
-        )
+        handle_failed_msg(id, payload, error)
       end
 
       def subscribe(id)
@@ -50,6 +44,20 @@ module Totoro
       def get_worker(worker_class)
         ::Worker.const_get(worker_class.to_s.camelize).new
       end
+
+      private
+
+      def handle_failed_msg(id, payload, error)
+        Rails.logger.error error.message
+        Rails.logger.info 'Add failed message to resend list'
+        STDOUT.flush
+        @config = nil
+        Totoro::TotoroFailedMessage.create(
+          class_name: to_s,
+          queue_id: id,
+          payload: payload
+        )
+      end
     end
   end
 end

data/lib/totoro/config.rb

@@ -12,7 +12,7 @@ module Totoro
     end
 
     def connect
-      @data[:connect]
+      @data[:connect].merge(threaded: false)
     end
 
     def queue(id)

data/lib/totoro/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Totoro
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
 end

data/test/totoro_test/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /totoro
   specs:
-    totoro (0.5.0)
+    totoro (0.5.4)
       bunny (~> 2.10)
       delayed_job_active_record (~> 4.1.3)
       delayed_job_recurring (~> 0.3.7)
@@ -49,8 +49,8 @@ GEM
     amq-protocol (2.3.0)
     arel (8.0.0)
     builder (3.2.3)
-    bunny (2.11.0)
-      amq-protocol (~> 2.3.0)
+    bunny (2.12.0)
+      amq-protocol (~> 2.3, >= 2.3.0)
     byebug (10.0.2)
     concurrent-ruby (1.0.5)
     crass (1.0.4)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: totoro
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - ShuHui18
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2018-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -131,6 +131,8 @@ files:
 - lib/totoro/tasks/resend_message.rake
 - lib/totoro/totoro_failed_message.rb
 - lib/totoro/version.rb
+- pkg/totoro-0.5.3.gem
+- pkg/totoro-0.5.4.gem
 - spec/spec_helper.rb
 - spec/totoro_spec.rb
 - test/totoro_test/Gemfile