gruf 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 5e2128aead5d95df32a7c576007e1f725321d994a30dcc799369ef04a2866bae
-  data.tar.gz: 9cce18e801ce59b8d156f9f02fdb0266281bea439cd6da85e94d7a0c6ca45df1
+SHA1:
+  metadata.gz: 8527045d1d987962200fe9f93d95d510dc065e13
+  data.tar.gz: d5d07f8f3b79194510fb4b7d923d1a7d25cc158a
 SHA512:
-  metadata.gz: 47e56d29f46dbdd51634bff6c2cba63b482e99ab94a57022e231bd4d081f8b26efcefa524712dd3a9faf0edc9aeddc07895b01a1acf51b9f24f512657faba61d
-  data.tar.gz: e3b9a9e56016f3ede0520bfc4fafd1f9409c32ea16a977ca27f6c296d0215d26ec9f1d8de705659710da855f22de6083c0681cdc5b974ef80b2602144892f488
+  metadata.gz: 40a3edb5d90cb4229344312eab599f9524d3d3e154fafaa6867e8e5958395ff518346e724d13b386f88964840ed48f4dec31f8c58b078f2c48936f90461c65e8
+  data.tar.gz: 504cce2f076685d662b45f5d6769f748528d1618a83d312f8cef461242936ff4519cbdb99a430eb0cf6613d166d8e70aa2af01f4bc0b29268b18db4c8cb0a2c9

data/CHANGELOG.md

@@ -2,9 +2,14 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 
 ### Pending release
 
+### 2.2.1
+
+- Now changes proc title once server is ready to process incoming requests [#44] 
+- Gruf now requires gRPC 1.10.x+ due to various fixes and improvements in the gRPC core libraries
+
 ### 2.2.0
 
-- Run server in a monitored thread to allow for trapped exits on sigints
+- Run server in a monitored thread to allow for trapped exits on sigints [#43]
 
 ### 2.1.1
 

data/README.md

@@ -17,7 +17,7 @@ up fast and efficiently at scale. Some of its features include:
   still preserving gRPC BadStatus codes
 * Server and client execution timings in responses
 
-gruf currently has active support for gRPC 1.4.x-1.9.x. gruf is compatible and tested with Ruby 2.2-2.5. 
+gruf currently has active support for gRPC 1.10.x+. gruf is compatible and tested with Ruby 2.2-2.5. 
 gruf is also not [Rails](https://github.com/rails/rails)-specific, and can be used in any Ruby framework 
 (such as [Grape](https://github.com/ruby-grape/grape), for instance).
 

data/gruf.gemspec

@@ -36,7 +36,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'pry'
 
-  spec.add_runtime_dependency 'grpc', '~> 1.4'
-  spec.add_runtime_dependency 'grpc-tools', '~> 1.4'
+  spec.add_runtime_dependency 'grpc', '~> 1.10'
+  spec.add_runtime_dependency 'grpc-tools', '~> 1.10'
   spec.add_runtime_dependency 'activesupport'
 end

data/lib/gruf/client.rb

@@ -135,13 +135,13 @@ module Gruf
     #
     # @param [Symbol] call_sig The call signature being executed
     # @param [Object] req (Optional) The protobuf request message to send
-    # @param [Hash] md (Optional) A hash of metadata key/values that are transported with the client request
+    # @param [Hash] metadata (Optional) A hash of metadata key/values that are transported with the client request
     # @param [Hash] opts (Optional) A hash of options to send to the gRPC request_response method
     #
-    def execute(call_sig, req, md, opts = {}, &block)
+    def execute(call_sig, req, metadata, opts = {}, &block)
       Timer.time do
         opts[:return_op] = true
-        opts[:metadata] = md
+        opts[:metadata] = metadata
         send(call_sig, req, opts, &block)
       end
     end

data/lib/gruf/error.rb

@@ -112,10 +112,11 @@ module Gruf
     ##
     # Ensure all metadata values are strings as HTTP/2 requires string values for transport
     #
+    # @param [Hash] metadata The existing metadata hash
     # @return [Hash] The newly set metadata
     #
-    def metadata=(md)
-      @metadata = md.map { |k, str| [k, str.to_s] }.to_h
+    def metadata=(metadata)
+      @metadata = metadata.map { |k, str| [k, str.to_s] }.to_h
     end
 
     ##

data/lib/gruf/response.rb

@@ -34,16 +34,16 @@ module Gruf
     ##
     # Initialize a response object with the given gRPC operation
     #
-    # @param [GRPC::ActiveCall::Operation] op The given operation for the current call
+    # @param [GRPC::ActiveCall::Operation] operation The given operation for the current call
     # @param [Float] execution_time The amount of time that the response took to occur
     #
-    def initialize(op, execution_time = nil)
-      @operation = op
-      @message = op.execute
-      @metadata = op.metadata
-      @trailing_metadata = op.trailing_metadata
-      @deadline = op.deadline
-      @cancelled = op.cancelled?
+    def initialize(operation, execution_time = nil)
+      @operation = operation
+      @message = operation.execute
+      @metadata = operation.metadata
+      @trailing_metadata = operation.trailing_metadata
+      @deadline = operation.deadline
+      @cancelled = operation.cancelled?
       @execution_time = execution_time || 0.0
     end
 
@@ -53,7 +53,7 @@ module Gruf
     # @return [Object] The protobuf response message
     #
     def message
-      @message ||= op.execute
+      @message ||= @operation.execute
     end
 
     ##

data/lib/gruf/server.rb

@@ -42,6 +42,7 @@ module Gruf
       @stop_server = false
       @stop_server_cv = ConditionVariable.new
       @stop_server_mu = Monitor.new
+      @server_mu = Monitor.new
       setup
     end
 
@@ -49,12 +50,14 @@ module Gruf
     # @return [GRPC::RpcServer] The GRPC server running
     #
     def server
-      unless @server
-        @server = GRPC::RpcServer.new(options)
-        @port = @server.add_http2_port(options.fetch(:hostname, Gruf.server_binding_url), ssl_credentials)
-        @services.each { |s| @server.handle(s) }
+      @server_mu.synchronize do
+        @server ||= begin
+          server = GRPC::RpcServer.new(options)
+          @port = server.add_http2_port(options.fetch(:hostname, Gruf.server_binding_url), ssl_credentials)
+          @services.each { |s| server.handle(s) }
+          server
+        end
       end
-      @server
     end
 
     ##
@@ -62,6 +65,13 @@ module Gruf
     #
     # :nocov:
     def start!
+      update_proc_title(:starting)
+
+      server_thread = Thread.new do
+        logger.info { 'Booting gRPC Server...' }
+        server.run
+      end
+
       stop_server_thread = Thread.new do
         loop do
           break if @stop_server
@@ -71,12 +81,14 @@ module Gruf
         server.stop
       end
 
-      logger.info { 'Booting gRPC Server...' }
+      server.wait_till_running
       @started = true
-      server.run
+      update_proc_title(:serving)
       stop_server_thread.join
+      server_thread.join
       @started = false
 
+      update_proc_title(:stopped)
       logger.info { 'Goodbye!' }
     end
     # :nocov:
@@ -218,5 +230,16 @@ module Gruf
       end
     end
     # :nocov:
+
+    ##
+    # Updates proc name/title
+    #
+    # @param [Symbol] state
+    #
+    # :nocov:
+    def update_proc_title(state)
+      Process.setproctitle("gruf #{Gruf::VERSION} -- #{state}")
+    end
+    # :nocov:
   end
 end

data/lib/gruf/version.rb

@@ -14,5 +14,5 @@
 # OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Gruf
-  VERSION = '2.2.0'.freeze
+  VERSION = '2.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gruf
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -158,7 +158,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: gRPC Ruby Framework