gruf 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 475f72d5e3590bcbdbc32f8698bf835540c964c1
-  data.tar.gz: 877dd14c01855fba9e2006bf50df04b07cfbb804
+  metadata.gz: 8494cc65922d13e3d9d70f0eeed43cb54cec22b0
+  data.tar.gz: e0afec068276451c09ad350d23ca165becb552b0
 SHA512:
-  metadata.gz: 2451565946bade99073f6dc7d567d623761a2f35a6c7541fdfc6dd431c29046635e057a1da9441390cbae5e32c8a6eb85e8a913ea851a9f7cc3079ea8971d4e1
-  data.tar.gz: 95d1fe70fde36eb85fae02c97cb518277f0d182f8d7bb5f659125b5d6bbcfa390e09707379c8969144384f34be782715d52c145ec83945bb37834f69405cf1be
+  metadata.gz: 6a783314fd5761fed60ee87426cb1d1aa78d515fc447232b88470a4b73e69b3f5102119f13cb6cea53086a45ef257d461aa467cc38a2dc09f3270b04e9638479
+  data.tar.gz: 2adc8447c02b004a67c06eb9d73b439afd00d1db1750046f4edbeb933686a737da82813fa71b16d4f087279056fb33c1dae821b5f98c9b19fd315a445be16dd8

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Changelog for the gruf gem. This includes internal history before the gem was ma
 
 ### Pending release
 
+### 1.2.7
+
+- Fix issues where field errors were persisted in between separate calls
+
 ### 1.2.6
 
 - Fix issues with arity and bidirectional streaming

data/lib/gruf/server.rb

@@ -24,8 +24,10 @@ module Gruf
 
     # @return [Array<Class>] The services this server is handling
     attr_accessor :services
-
+    # @return [GRPC::RpcServer] The underlying GRPC server instance
     attr_reader :server
+    # @return [Integer] The port the server is bound to
+    attr_reader :port
 
     ##
     # Initialize the server and load and setup the services
@@ -43,7 +45,7 @@ module Gruf
     def server
       unless @server
         @server = GRPC::RpcServer.new(Gruf.server_options)
-        @server.add_http2_port(Gruf.server_binding_url, ssl_credentials)
+        @port = @server.add_http2_port(Gruf.server_binding_url, ssl_credentials)
         services.each do |s|
           @server.handle(s)
         end

data/lib/gruf/service.rb

@@ -223,11 +223,14 @@ module Gruf
     # @param [Hash] metadata (Optional) Any metadata to inject into the trailing metadata for the response
     #
     def fail!(_req, call, error_code, app_code = nil, message = '', metadata = {})
-      error.code = error_code.to_sym
-      error.app_code = app_code ? app_code.to_sym : error.code
-      error.message = message.to_s
-      error.metadata = metadata
-      error.fail!(call)
+      e = error
+      e.code = error_code.to_sym
+      e.app_code = app_code ? app_code.to_sym : error.code
+      e.message = message.to_s
+      e.metadata = metadata
+
+      cleanup!
+      e.fail!(call)
     end
 
     private
@@ -241,7 +244,7 @@ module Gruf
     # @return [Object] The response object
     #
     def call_chain(original_call_sig, req, call, &block)
-      outer_around_call(original_call_sig, req, call) do
+      outer_result = outer_around_call(original_call_sig, req, call) do
         begin
           before_call(original_call_sig, req, call)
 
@@ -263,7 +266,10 @@ module Gruf
 
         result
       end
+      cleanup!
+      outer_result
     rescue GRPC::BadStatus
+      cleanup!
       raise
     rescue => e
       set_debug_info(e.message, e.backtrace) if Gruf.backtrace_on_error
@@ -316,5 +322,12 @@ module Gruf
     def error
       @error ||= Gruf::Error.new
     end
+
+    ##
+    # Cleanup after a service call
+    #
+    def cleanup!
+      remove_instance_variable(:@error) if instance_variable_defined?(:@error)
+    end
   end
 end

data/lib/gruf/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gruf
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
 platform: ruby
 authors:
 - Shaun McCormick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-01 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -159,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: gRPC Ruby Framework