totoro 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 85630904511993ae3171f7e70b5c8fdec2f973c9ba79de099bd9b2ff897def24
-  data.tar.gz: a3d79f5cc3a21c193c0e14acc119d971f2dbcc20e2e0cd7044c716f067edf16d
+  metadata.gz: aa6dd8c493beb2f3161254c4d0c207969183d3cbe0da84dc8782c63acba3f073
+  data.tar.gz: 50e0437780093c06a2c928b49fff7c8d09a094cf906a5c9ea4cd6cf54a070132
 SHA512:
-  metadata.gz: dc738f3bf93be2be9d7030668c48dec8f7b43f3230cc7c4cfac5803cfeb357b4cefe81fe22da9391cce9f07e0c99511707f05b63cfc3303173a3df9f8c86e943
-  data.tar.gz: 1d7a10ef164c84bc2b69165e52fdfd0b59a1e319e73e2fc4dcf804559d7d437949bff4bab6240f4c5c842b2d25c2fce097fd24a749e431ab9922d2f2476e3e13
+  metadata.gz: '08d3b721c6d06504d37d6ebf153377df3354e446d79852b090e1d93920eb301fbb65cf925eba8adf10d1c0303e44230e91d5bdb89418f6e186f40b0b4ca716b0'
+  data.tar.gz: 883d9a3d0ceabd7bff3a1eebe6eda1b9700f384dea8895fa2ba628d36c587d5a29f365d8a43f5dffd8b85796f2eb1f9515fd8a5767bb81ff38beedadd83f22a4

data/lib/totoro/base_queue.rb

@@ -13,27 +13,21 @@ module Totoro
         @connection ||= Bunny.new(config.connect.merge(threaded: false)).tap(&:start)
       end
 
-      def channel
-        @channel ||= connection.create_channel
-      end
-
       def subscribe_channel
         @subscribe_channel ||= Bunny.new(config.connect).tap(&:start).create_channel
       end
 
-      def exchange
-        @exchange ||= channel.default_exchange
-      end
-
-      # enqueue = publish to direct exchange
       def enqueue(id, payload)
-        queue = channel.queue(*config.queue(id))
+        channel = connection.create_channel
+        queue =  channel.queue(*config.queue(id))
         payload = JSON.dump payload
-        exchange.publish(payload, routing_key: queue.name)
+        channel.default_exchange.publish(payload, routing_key: queue.name)
         Rails.logger.info "send message to #{queue.name}"
         STDOUT.flush
+        channel.close
       rescue Bunny::TCPConnectionFailedForAllHosts,
              Bunny::NetworkErrorWrapper,
+             Bunny::ChannelAlreadyClosed,
              AMQ::Protocol::EmptyResponseError => error
         handle_failed_msg(id, payload, error)
       end
@@ -55,13 +49,20 @@ module Totoro
         Rails.logger.error error.message
         Rails.logger.info 'Add failed message to resend list'
         STDOUT.flush
-        @connection = nil
+        clear_connection
         Totoro::TotoroFailedMessage.create(
           class_name: to_s,
           queue_id: id,
           payload: payload
         )
       end
+
+      def clear_connection
+        @exchange = nil
+        @channel = nil
+        @subscribe_channel = nil
+        @connection = nil
+      end
     end
   end
 end

data/lib/totoro/version.rb

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

data/test/rabbitmq_commands.txt

@@ -0,0 +1,6 @@
+
+rabbitmqctl set_permissions -p / hui '.*' '.*' '.*'
+rabbitmqctl clear_permissions -p / hui
+rabbitmqctl close_all_connections "changed_user_permissions"
+
+Totoro::Queue.enqueue('example_queue', {shu: 123})

data/test/totoro_test/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /totoro
   specs:
-    totoro (0.5.7)
+    totoro (0.6.0)
       bunny (~> 2.10)
       delayed_job_active_record (~> 4.1.3)
       delayed_job_recurring (~> 0.3.7)

data/test/totoro_test/app/services/bench_mark.txt

@@ -0,0 +1,7 @@
+with out put
+1000
+1.0696876
+9.3701257
+10000 
+10.0278923
+85.1188306

data/test/totoro_test/app/services/load_test.rb

@@ -0,0 +1,19 @@
+class LoadTest
+  def test_with_channel
+    start_time = Time.now
+    for i in 0..1000
+      Totoro::Queue.enqueue_with_new_channel('example_queue', {shu: i})
+    end
+    end_time = Time.now
+    p (end_time - start_time)
+  end
+
+  def test_without_channel
+    start_time = Time.now
+    for i in 0..1000
+      Totoro::Queue.enqueue('example_queue', {shu: i})
+    end
+    end_time = Time.now
+    p (end_time - start_time)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: totoro
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - ShuHui18
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-06 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -131,8 +131,10 @@ files:
 - lib/totoro/tasks/resend_message.rake
 - lib/totoro/totoro_failed_message.rb
 - lib/totoro/version.rb
+- pkg/totoro-0.6.0.gem
 - spec/spec_helper.rb
 - spec/totoro_spec.rb
+- test/rabbitmq_commands.txt
 - test/totoro_test/Gemfile
 - test/totoro_test/Gemfile.lock
 - test/totoro_test/README.md
@@ -144,6 +146,8 @@ files:
 - test/totoro_test/app/mailers/application_mailer.rb
 - test/totoro_test/app/models/application_record.rb
 - test/totoro_test/app/models/worker/example_queue.rb
+- test/totoro_test/app/services/bench_mark.txt
+- test/totoro_test/app/services/load_test.rb
 - test/totoro_test/app/views/layouts/mailer.html.erb
 - test/totoro_test/app/views/layouts/mailer.text.erb
 - test/totoro_test/bin/bundle