shoryuken 3.0.3 → 3.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d55fd64fa9c0f923238d2582e4404dec95d4442
-  data.tar.gz: 05cd9f7a3c025926c95cdfa687a7e1a15bcf2ecc
+  metadata.gz: e1367b27e316c258563ef328b78bc64947c849d8
+  data.tar.gz: 285db9748d737bfe07a6904db381d3c11883cd05
 SHA512:
-  metadata.gz: 323c9ffefa9992bea8ecc7e5ac81039b73d1ff7c41985482c89dfcfab4e1ed4a97e3613512fbf5b933a34f0a428c18a3169202f105aa74b5d55c3d782910037e
-  data.tar.gz: 33713211be0bdb68a83fd8729bf85b1bc1a0d437d6527d7ccd92954df0be6bb04724a4857cd3e80bc41a8824ae7d81786c50a3e68b0115697c0e1c129d327f77
+  metadata.gz: 7f85154f339098c0b04a01673548b0c688217290772131dc28a1ed0c378b0cb671576f5a195143d915a8ab70ed836b089bd12ff6c4d6aa78d81bf858729323a6
+  data.tar.gz: 9b5180a9baf239178c11afcc7f55d31392162deeb95aa7f49836a64e94fcc114b145ba82414b83ad22d278612d3cca53436bb804d41d98ccfbe9f1eea4f678cc

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## [v3.0.4] - 2017-03-24
+- Add `sqs purge` command. See https://docs.aws.amazon.com/AWSSimpleQueueService/latest/APIReference/API_PurgeQueue.html
+ - [#344](https://github.com/phstc/shoryuken/pull/344)
+
+- Fix "Thread exhaustion" error. This issue was most noticed when using long polling. @waynerobinson :beers: for pairing up on this.
+ - [#345](https://github.com/phstc/shoryuken/pull/345)
+
 ## [v3.0.3] - 2017-03-19
 - Update `sqs` CLI commands to use `get_queue_url` when appropriated
  - [#341](https://github.com/phstc/shoryuken/pull/341)

data/bin/cli/sqs.rb

@@ -92,7 +92,7 @@ module Shoryuken
         end
       end
 
-      desc 'ls [QUEUE-NAME-PREFIX]', 'List queues'
+      desc 'ls [QUEUE-NAME-PREFIX]', 'Lists queues'
       method_option :watch,          aliases: '-w',  type: :boolean,              desc: 'watch queues'
       method_option :watch_interval,                 type: :numeric, default: 10, desc: 'watch interval'
       def ls(queue_name_prefix = '')
@@ -110,7 +110,7 @@ module Shoryuken
         end
       end
 
-      desc 'dump QUEUE-NAME', 'Dump messages from a queue into a JSON lines file'
+      desc 'dump QUEUE-NAME', 'Dumps messages from a queue into a JSON lines file'
       method_option :number, aliases: '-n', type: :numeric, default: Float::INFINITY, desc: 'number of messages to dump'
       method_option :path,   aliases: '-p', type: :string,  default: './',            desc: 'path to save the dump file'
       method_option :delete, aliases: '-d', type: :boolean, default: true,            desc: 'delete from the queue'
@@ -144,7 +144,7 @@ module Shoryuken
         file.close if file
       end
 
-      desc 'requeue QUEUE-NAME PATH', 'Requeue messages from a dump file'
+      desc 'requeue QUEUE-NAME PATH', 'Requeues messages from a dump file'
       def requeue(queue_name, path)
         fail_task "Path #{path} not found" unless File.exist?(path)
 
@@ -155,7 +155,7 @@ module Shoryuken
         say "Requeued #{messages.size} messages from #{path} to #{queue_name}", :green
       end
 
-      desc 'mv QUEUE-NAME-SOURCE QUEUE-NAME-TARGET', 'Move messages from one queue (source) to another (target)'
+      desc 'mv QUEUE-NAME-SOURCE QUEUE-NAME-TARGET', 'Moves messages from one queue (source) to another (target)'
       method_option :number, aliases: '-n', type: :numeric, default: Float::INFINITY, desc: 'number of messages to move'
       method_option :delete, aliases: '-d', type: :boolean, default: true,            desc: 'delete from the queue'
       def mv(queue_name_source, queue_name_target)
@@ -175,6 +175,13 @@ module Shoryuken
           say "Moved #{count} messages from #{queue_name_source} to #{queue_name_target}", :green
         end
       end
+
+      desc 'purge QUEUE-NAME', 'Deletes the messages in a queue'
+      def purge(queue_name)
+        sqs.purge_queue(queue_url: find_queue_url(queue_name))
+
+        say "Purge request sent for #{queue_name}. The message deletion process takes up to 60 seconds", :yellow
+      end
     end
   end
 end

data/bin/shoryuken

@@ -16,7 +16,7 @@ module Shoryuken
 
       register(Shoryuken::CLI::SQS, 'sqs', 'sqs COMMAND', 'SQS commands')
 
-      desc 'start', 'Start shoryuken'
+      desc 'start', 'Starts shoryuken'
       method_option :concurrency, aliases: '-c', type: :numeric, desc: 'Processor threads to use'
       method_option :daemon,      aliases: '-d', type: :boolean, desc: 'Daemonize process'
       method_option :queues,      aliases: '-q', type: :array,   desc: 'Queues to process with optional weights'
@@ -39,7 +39,7 @@ module Shoryuken
         Shoryuken::Runner.instance.run(opts.freeze)
       end
 
-      desc 'version', 'Print version'
+      desc 'version', 'Prints version'
       def version
         say "Shoryuken #{Shoryuken::VERSION}"
       end

data/lib/shoryuken/manager.rb

@@ -2,8 +2,7 @@ module Shoryuken
   class Manager
     include Util
 
-    BATCH_LIMIT        = 10
-    HEARTBEAT_INTERVAL = 0.1
+    BATCH_LIMIT = 10
 
     def initialize(fetcher, polling_strategy)
       @count = Shoryuken.options.fetch(:concurrency, 25)
@@ -13,22 +12,18 @@ module Shoryuken
       @queues = Shoryuken.queues.dup.uniq
 
       @done = Concurrent::AtomicBoolean.new(false)
-      @dispatching = Concurrent::AtomicBoolean.new(false)
 
       @fetcher = fetcher
       @polling_strategy = polling_strategy
 
-      @heartbeat = Concurrent::TimerTask.new(run_now: true,
-                                             execution_interval: HEARTBEAT_INTERVAL,
-                                             timeout_interval: 60) { dispatch }
-
       @pool = Concurrent::FixedThreadPool.new(@count, max_queue: @count)
+      @dispatcher_executor = Concurrent::SingleThreadExecutor.new
     end
 
     def start
       logger.info { 'Starting' }
 
-      @heartbeat.execute
+      dispatch_async
     end
 
     def stop(options = {})
@@ -43,7 +38,7 @@ module Shoryuken
 
       logger.info { 'Shutting down workers' }
 
-      @heartbeat.kill
+      @dispatcher_executor.kill
 
       if options[:shutdown]
         hard_shutdown_in(options[:timeout])
@@ -58,18 +53,23 @@ module Shoryuken
 
     private
 
-    def dispatch
+    def dispatch_async
+      @dispatcher_executor.post(&method(:dispatch_now))
+    end
+
+    def dispatch_now
       return if @done.true?
-      return unless @dispatching.make_true
 
-      return if ready.zero?
-      return unless (queue = @polling_strategy.next_queue)
+      begin
+        return if ready.zero?
+        return unless (queue = @polling_strategy.next_queue)
 
-      logger.debug { "Ready: #{ready}, Busy: #{busy}, Active Queues: #{@polling_strategy.active_queues}" }
+        logger.debug { "Ready: #{ready}, Busy: #{busy}, Active Queues: #{@polling_strategy.active_queues}" }
 
-      batched_queue?(queue) ? dispatch_batch(queue) : dispatch_single_messages(queue)
-    ensure
-      @dispatching.make_false
+        batched_queue?(queue) ? dispatch_batch(queue) : dispatch_single_messages(queue)
+      ensure
+        dispatch_async
+      end
     end
 
     def busy

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '3.0.3'.freeze
+  VERSION = '3.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.0.4
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler