protobuf-nats 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee1af2d977263e468709cdfaa78d0d4819f0ae7e
-  data.tar.gz: fc9664c48ba9ac1dab3660d21011d87aac49c25e
+  metadata.gz: 5e444dd3193486c805f44d670ca6aceca10f7df3
+  data.tar.gz: 2f0ed9b4431fc0379f41348fca8820dc57953421
 SHA512:
-  metadata.gz: f090b4fbeaa265db5e9c2694b1ebd9608209efd52d55a7af10719a4a0328ee9ba47eed27c246a21971e5f12640c320ef66ed3d5dcdb9c7cac88bfa87cec40d05
-  data.tar.gz: 5ae55860c6c42dae98c209e40508987c2fd505e733e6693cefabf718e3d9914c78779571aad8ce4addf7ce291c3a1c3aa1a9d5df2d372d670ca68ed88a26355e
+  metadata.gz: b99622db5416e0626861531c8777f9207a23b5a3afba48211db0bf312f92fee1f49e71eeca0dc5621614b6452c439c96c329546281b823c2563a41a9f167f6bd
+  data.tar.gz: a0a52c9c909f552a2b01bfce3eb0a9fc18b2fd424f99c9c8301182526dd9ea69bac3bbdab5977f3b1f06f6efe79230ceb9fe332973d921dea86439e7b94fbdbe

data/lib/protobuf/nats/runner.rb

@@ -6,6 +6,7 @@ require "protobuf/nats"
 module Protobuf
   module Nats
     class Runner
+      include ::Protobuf::Logging
 
       def initialize(options)
         @options = case

data/lib/protobuf/nats/server.rb

@@ -1,5 +1,4 @@
 require "active_support/core_ext/class/subclasses"
-require "protobuf/nats/fixed_thread_pool_with_no_queue"
 require "protobuf/rpc/server"
 require "protobuf/rpc/service"
 
@@ -19,7 +18,7 @@ module Protobuf
         @nats = options[:client] || ::NATS::IO::Client.new
         @nats.connect(::Protobuf::Nats.config.connection_options)
 
-        @thread_pool = ::Protobuf::Nats::FixedThreadPoolWithNoQueue.new(options[:threads])
+        @thread_pool = ::Concurrent::FixedThreadPool.new(options[:threads], :max_queue => options[:threads])
 
         @subscriptions = []
       end
@@ -29,9 +28,7 @@ module Protobuf
       end
 
       def execute_request_promise(request_data, reply_id)
-        ::Concurrent::Promise.new(:executor => thread_pool).then do
-          # Publish an ACK.
-          nats.publish(reply_id, ::Protobuf::Nats::Messages::ACK)
+        promise = ::Concurrent::Promise.new(:executor => thread_pool).then do
           # Process request.
           response_data = handle_request(request_data)
           # Publish response.
@@ -42,6 +39,11 @@ module Protobuf
             logger.error error.backtrace.join("\n")
           end
         end.execute
+
+        # Publish an ACK to signal the server has picked up the work.
+        nats.publish(reply_id, ::Protobuf::Nats::Messages::ACK)
+
+        promise
       rescue ::Concurrent::RejectedExecutionError
         nil
       end

data/lib/protobuf/nats/version.rb

@@ -1,5 +1,5 @@
 module Protobuf
   module Nats
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/protobuf/nats.rb

@@ -4,8 +4,7 @@ require "protobuf"
 # We don't need this, but the CLI attempts to terminate.
 require "protobuf/rpc/service_directory"
 
-require "connection_pool"
-
+require "concurrent"
 require "nats/io/client"
 
 require "protobuf/nats/client"

data/protobuf-nats.gemspec

@@ -30,8 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "protobuf", "3.7.0.pre3"
-  spec.add_runtime_dependency "connection_pool"
+  spec.add_runtime_dependency "protobuf", "~> 3.7"
   spec.add_runtime_dependency "concurrent-ruby"
   spec.add_runtime_dependency "nats-pure"
 

metadata

@@ -1,43 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: protobuf-nats
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brandon Dewitt
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-27 00:00:00.000000000 Z
+date: 2017-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protobuf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.7.0.pre3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.7.0.pre3
-- !ruby/object:Gem::Dependency
-  name: connection_pool
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +147,6 @@ files:
 - lib/protobuf/nats.rb
 - lib/protobuf/nats/client.rb
 - lib/protobuf/nats/config.rb
-- lib/protobuf/nats/fixed_thread_pool_with_no_queue.rb
 - lib/protobuf/nats/runner.rb
 - lib/protobuf/nats/server.rb
 - lib/protobuf/nats/version.rb

data/lib/protobuf/nats/fixed_thread_pool_with_no_queue.rb

@@ -1,32 +0,0 @@
-require "concurrent"
-
-module Protobuf
-  module Nats
-    class FixedThreadPoolWithNoQueue < ::Concurrent::FixedThreadPool
-      def ns_initialize(opts)
-        min_length = opts.fetch(:min_threads, DEFAULT_MIN_POOL_SIZE).to_i
-        max_length = opts.fetch(:max_threads, DEFAULT_MAX_POOL_SIZE).to_i
-        idletime = opts.fetch(:idletime, DEFAULT_THREAD_IDLETIMEOUT).to_i
-        @fallback_policy = opts.fetch(:fallback_policy, :abort)
-
-        if ::Concurrent.on_jruby?
-          super(opts)
-
-          # We need to use a synchronous queue to ensure we only perform work
-          # when a thread is available.
-          queue = java.util.concurrent.SynchronousQueue.new
-          @executor = java.util.concurrent.ThreadPoolExecutor.new(
-            min_length, max_length,
-            idletime, java.util.concurrent.TimeUnit::SECONDS,
-            queue, FALLBACK_POLICY_CLASSES[@fallback_policy].new)
-        else
-          # MRI will take a max queue of -1 to mean no queue.
-          opts[:max_queue] = -1
-          super(opts)
-        end
-
-        @max_queue = -1
-      end
-    end
-  end
-end