fastly_nsq 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a40b18d43363206c94cbb448ba4ac54a2af31420a7fe89bada891d704513dde
-  data.tar.gz: ce9b562df928b8d46466f52be7dab00aba65fb3a4f0301b0c76d5647fa8c639a
+  metadata.gz: 135337a9892fdb4e0ddb5d448cae0f9d298b66a3a1a2d53966b9ba1c3c31d734
+  data.tar.gz: 103ab244297b6e29b0f50fdda88881cbe030943b2d019dcf31f9080203b8d36b
 SHA512:
-  metadata.gz: e33edc84dde18aed11956c98a412944d08694403c5237cb02b61bddfa0087e9589dd0cfdf214939c1446205bab79afe8ad7c24a0863231307e07e3353ca7548f
-  data.tar.gz: 2f1f3cb6c36e13d181f742caec494ed31f0b4f2275ced090849b878ec8c40f6da6d852724ba7adc244aba7b0a99b1932459a5dc026e9e8cbd5998a77ad6dfc96
+  metadata.gz: 948bd9896a2709c88b2dffdfc8fa13de42d8f0d46f62c8cd635ff4323dd57a2be75cb805598a6878059a7416aa5e78f719cd4d026462833fe609168a46e8ebd9
+  data.tar.gz: 299eb6013dc14fd5f7fc84e752d75b60c633883e60517b9f507e7247bca4d6bb0a2ca4825cffc8b3836697208e76cac464a83ec25bda5119b852c724b25b82bc

data/ChangeLog.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [v1.14.0](https://github.com/fastly/fastly_nsq/tree/v1.14.0)
+## [v1.15.0](https://github.com/fastly/fastly_nsq/tree/v1.15.0)
 
+[Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.14.0...v1.15.0)
+
+**Merged pull requests:**
+
+- Add support for configuring max\_threads [\#94](https://github.com/fastly/fastly_nsq/pull/94) ([leklund](https://github.com/leklund))
+
+## [v1.14.0](https://github.com/fastly/fastly_nsq/tree/v1.14.0) (2018-08-13)
 [Full Changelog](https://github.com/fastly/fastly_nsq/compare/v1.13.1...v1.14.0)
 
 **Merged pull requests:**

data/README.md

@@ -159,6 +159,7 @@ FastlyNsq.configure do |config|
 
   config.max_attempts = 20
   config.max_req_timeout = (60 * 60 * 4 * 1_000) # 4 hours
+  config.max_processing_pool_threads = 10
 
   lc.listen 'posts', ->(m) { puts "posts: #{m.body}" }
   lc.listen 'blogs', ->(m) { puts "blogs: #{m.body}" }, priority: 3

data/lib/fastly_nsq.rb

@@ -30,6 +30,10 @@ module FastlyNsq
     # @return [Integer]
     attr_writer :max_req_timeout
 
+    # Maximum number of threads for FastlyNsq::PriorityThreadPool
+    # @return [Integer]
+    attr_writer :max_processing_pool_threads
+
     ##
     # Map of lifecycle events
     # @return [Hash]
@@ -111,6 +115,13 @@ module FastlyNsq
       @max_req_timeout ||= ENV.fetch('MAX_REQ_TIMEOUT', 60 * 60 * 1_000).to_i
     end
 
+    # Maximum number of threads for FastlyNsq::PriorityThreadPool
+    # Default setting is 5 and can be set via ENV['MAX_PROCESSING_POOL_THREADS']
+    # @return [Integer]
+    def max_processing_pool_threads
+      @max_processing_pool_threads ||= ENV.fetch('MAX_PROCESSING_POOL_THREADS', 5).to_i
+    end
+
     ##
     # Return an array of NSQ lookupd http addresses sourced from ENV['NSQLOOKUPD_HTTP_ADDRESS']
     # @return [Array<String>] list of nsqlookupd http addresses

data/lib/fastly_nsq/feeder.rb

@@ -32,7 +32,7 @@ class FastlyNsq::Feeder
   # swallow the exception.
   #
   # @param message [Nsq::Message]
-  # @see http://ruby-concurrency.github.io/concurrent-ruby/Concurrent/ThreadPoolExecutor.html#post-instance_method
+  # @see http://ruby-concurrency.github.io/concurrent-ruby/1.0.5/Concurrent/ThreadPoolExecutor.html#post-instance_method
   # @see Nsq::Connection#read_loop
   def push(message)
     FastlyNsq.manager.pool.post(priority) do

data/lib/fastly_nsq/manager.rb

@@ -4,7 +4,6 @@
 # Interface for tracking listeners and managing the processing pool.
 class FastlyNsq::Manager
   DEADLINE = 30
-  DEFAULT_POOL_SIZE = 5
 
   # @return [Boolean] Set true when all listeners are stopped
   attr_reader :done
@@ -19,12 +18,13 @@ class FastlyNsq::Manager
   # Create a FastlyNsq::Manager
   #
   # @param logger [Logger]
+  # @param max_threads [Integer] Maxiumum number of threads to be used by {FastlyNsq::PriorityThreadPool}
   # @param pool_options [Hash] Options forwarded to {FastlyNsq::PriorityThreadPool} constructor.
-  def initialize(logger: FastlyNsq.logger, **pool_options)
+  def initialize(logger: FastlyNsq.logger, max_threads: FastlyNsq.max_processing_pool_threads, **pool_options)
     @done      = false
     @logger    = logger
     @pool      = FastlyNsq::PriorityThreadPool.new(
-      { fallback_policy: :caller_runs, max_threads: DEFAULT_POOL_SIZE }.merge(pool_options),
+      { fallback_policy: :caller_runs, max_threads: max_threads }.merge(pool_options),
     )
   end
 

data/lib/fastly_nsq/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FastlyNsq
-  VERSION = '1.14.0'
+  VERSION = '1.15.0'
 end

data/spec/manager_spec.rb

@@ -16,14 +16,14 @@ RSpec.describe FastlyNsq::Manager do
 
   describe '#initialize' do
     it 'allows max_threads to be specified' do
-      max_threads = described_class::DEFAULT_POOL_SIZE * 2
+      max_threads = FastlyNsq.max_processing_pool_threads * 2
       manager = described_class.new(max_threads: max_threads)
 
       expect(manager.pool.max_threads).to eq(max_threads)
     end
 
-    it 'defaults max_threads to DEFAULT_POOL_SIZE' do
-      expect(subject.pool.max_threads).to eq(described_class::DEFAULT_POOL_SIZE)
+    it 'defaults max_threads to FastlyNsq.max_processing_pool_threads' do
+      expect(subject.pool.max_threads).to eq(FastlyNsq.max_processing_pool_threads)
     end
 
     it 'allows fallback_policy to be specified' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastly_nsq
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - Tommy O'Neil
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-13 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Fastly NSQ Adapter