protobuf 3.3.6 → 3.4.0

data/lib/protobuf/rpc/dynamic_discovery.pb.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 ##
 # This file is auto-generated. DO NOT EDIT!
 #

data/lib/protobuf/rpc/env.rb

@@ -16,19 +16,19 @@ module Protobuf
       #
       def self.hash_accessor(*names) #:nodoc:
         names.each do |name|
-          class_eval <<-METHOD, __FILE__, __LINE__ + 1
-            def #{name}
-              self['#{name}']
-            end
+          name_str = name.to_s.freeze
 
-            def #{name}=(value)
-              self['#{name}'] = value
-            end
+          define_method name do
+            self[name_str]
+          end
 
-            def #{name}?
-              ! self['#{name}'].nil?
-            end
-          METHOD
+          define_method "#{name}=" do |value|
+            self[name_str] = value
+          end
+
+          define_method "#{name}?" do
+            !self[name_str].nil?
+          end
         end
       end
 
@@ -48,7 +48,7 @@ module Protobuf
                     :service_name,
                     :worker_id
 
-      def initialize(options={})
+      def initialize(options = {})
         merge!(options)
 
         self['worker_id'] = ::Thread.current.object_id.to_s(16)

data/lib/protobuf/rpc/error.rb

@@ -8,7 +8,7 @@ module Protobuf
     class PbError < StandardError
       attr_reader :error_type
 
-      def initialize(message='An unknown RpcError occurred', error_type='RPC_ERROR')
+      def initialize(message = 'An unknown RpcError occurred', error_type = 'RPC_ERROR')
         @error_type = error_type.is_a?(String) ? Socketrpc::ErrorReason.const_get(error_type) : error_type
         super message
       end

data/lib/protobuf/rpc/error/client_error.rb

@@ -4,25 +4,25 @@ module Protobuf
   module Rpc
 
     class InvalidRequestProto < PbError
-      def initialize(message='Invalid request type given')
+      def initialize(message = 'Invalid request type given')
         super message, 'INVALID_REQUEST_PROTO'
       end
     end
 
     class BadResponseProto < PbError
-      def initialize(message='Bad response type from server')
+      def initialize(message = 'Bad response type from server')
         super message, 'BAD_RESPONSE_PROTO'
       end
     end
 
     class UnkownHost < PbError
-      def initialize(message='Unknown host or port')
+      def initialize(message = 'Unknown host or port')
         super message, 'UNKNOWN_HOST'
       end
     end
 
     class IOError < PbError
-      def initialize(message='IO Error occurred')
+      def initialize(message = 'IO Error occurred')
         super message, 'IO_ERROR'
       end
     end

data/lib/protobuf/rpc/error/server_error.rb

@@ -4,37 +4,37 @@ module Protobuf
   module Rpc
 
     class BadRequestData < PbError
-      def initialize message='Unable to parse request'
+      def initialize(message = 'Unable to parse request')
         super message, 'BAD_REQUEST_DATA'
       end
     end
 
     class BadRequestProto < PbError
-      def initialize message='Request is of wrong type'
+      def initialize(message = 'Request is of wrong type')
         super message, 'BAD_REQUEST_PROTO'
       end
     end
 
     class ServiceNotFound < PbError
-      def initialize message='Service class not found'
+      def initialize(message = 'Service class not found')
         super message, 'SERVICE_NOT_FOUND'
       end
     end
 
     class MethodNotFound < PbError
-      def initialize message='Service method not found'
+      def initialize(message = 'Service method not found')
         super message, 'METHOD_NOT_FOUND'
       end
     end
 
     class RpcError < PbError
-      def initialize message='RPC exception occurred'
+      def initialize(message = 'RPC exception occurred')
         super message, 'RPC_ERROR'
       end
     end
 
     class RpcFailed < PbError
-      def initialize message='RPC failed'
+      def initialize(message = 'RPC failed')
         super message, 'RPC_FAILED'
       end
     end

data/lib/protobuf/rpc/middleware/exception_handler.rb

@@ -22,7 +22,7 @@ module Protobuf
           env
         end
 
-      private
+        private
 
         # Wrap exceptions in a generic Protobuf errors unless they already are
         #

data/lib/protobuf/rpc/middleware/logger.rb

@@ -19,7 +19,7 @@ module Protobuf
           env
         end
 
-      private
+        private
 
         def instrumenter
           @instrumenter ||= Instrumenter.new
@@ -63,11 +63,11 @@ module Protobuf
               rpc,
               sizes,
               elapsed_time,
-              @end_time.try(:iso8601)
+              @end_time.try(:iso8601),
             ].compact.join(' - ')
           end
 
-        private
+          private
 
           def elapsed_time
             (@start_time && @end_time ? "#{(@end_time - @start_time).round(4)}s" : nil)

data/lib/protobuf/rpc/middleware/request_decoder.rb

@@ -30,14 +30,14 @@ module Protobuf
           env.log_signature || super
         end
 
-      private
+        private
 
         def method_name
           @method_name ||= begin
             method_name = request_wrapper.method_name.underscore.to_sym
 
             unless service.rpc_method?(method_name)
-              raise MethodNotFound.new("#{service.name}##{method_name} is not a defined RPC method.")
+              fail MethodNotFound, "#{service.name}##{method_name} is not a defined RPC method."
             end
 
             method_name
@@ -50,7 +50,7 @@ module Protobuf
             rpc_method.request_type.decode(data)
           end
         rescue => exception
-          raise BadRequestData.new("Unable to decode request: #{exception.message}")
+          raise BadRequestData, "Unable to decode request: #{exception.message}"
         end
 
         # Decode the incoming request object into our expected request object
@@ -61,7 +61,7 @@ module Protobuf
             Socketrpc::Request.decode(env.encoded_request)
           end
         rescue => exception
-          raise BadRequestData.new("Unable to decode request: #{exception.message}")
+          raise BadRequestData, "Unable to decode request: #{exception.message}"
         end
 
         def rpc_method
@@ -71,7 +71,7 @@ module Protobuf
         def service
           @service ||= service_name.constantize
         rescue NameError
-          raise ServiceNotFound.new("Service class #{service_name} is not defined.")
+          raise ServiceNotFound, "Service class #{service_name} is not defined."
         end
 
         def service_name

data/lib/protobuf/rpc/middleware/response_encoder.rb

@@ -22,7 +22,7 @@ module Protobuf
           env.log_signature || super
         end
 
-      private
+        private
 
         # Encode the response wrapper to return to the client
         #
@@ -35,7 +35,7 @@ module Protobuf
 
           # Rescue encoding exceptions, re-wrap them as generic protobuf errors,
           # and re-raise them
-          raise PbError.new(exception.message)
+          raise PbError, exception.message
         end
 
         # Prod the object to see if we can produce a proto object as a response
@@ -66,7 +66,7 @@ module Protobuf
           expected = env.response_type
 
           if expected != actual
-            raise BadResponseProto.new("Expected response to be of type #{expected.name} but was #{actual.name}")
+            fail BadResponseProto, "Expected response to be of type #{expected.name} but was #{actual.name}"
           end
 
           candidate

data/lib/protobuf/rpc/rpc.pb.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 ##
 # This file is auto-generated. DO NOT EDIT!
 #

data/lib/protobuf/rpc/servers/socket/server.rb

@@ -1,4 +1,5 @@
-require 'protobuf/rpc/server'
+require 'set'
+
 require 'protobuf/rpc/servers/socket/worker'
 
 module Protobuf
@@ -9,33 +10,52 @@ module Protobuf
 
         AUTO_COLLECT_TIMEOUT = 5 # seconds
 
+        private
+
+        attr_accessor :threshold, :host, :port, :backlog
+        attr_writer :running
+
+        public
+
+        attr_reader :running
+        alias_method :running?, :running
+
         def initialize(options)
-          @options = options
+          self.running = false
+          self.host = options.fetch(:host)
+          self.port = options.fetch(:port)
+          self.backlog = options.fetch(:backlog, 100)
+          self.threshold = options.fetch(:threshold, 100)
+        end
+
+        def threads
+          @threads ||= []
+        end
+
+        def working
+          @working ||= Set.new
         end
 
         def cleanup?
-          # every 10 connections run a cleanup routine after closing the response
-          @threads.size > (@threshold - 1) && (@threads.size % @threshold) == 0
+          # every `threshold` connections run a cleanup routine after closing the response
+          threads.size > 0 && threads.size % threshold == 0
         end
 
         def cleanup_threads
-          logger.debug { sign_message("Thread cleanup - #{@threads.size} - start") }
-
-          @threads = @threads.select do |t|
-            if t[:thread].alive?
-              true
-            else
-              t[:thread].join
-              @working.delete(t[:socket])
-              false
+          logger.debug { sign_message("Thread cleanup - #{threads.size} - start") }
+
+          threads.delete_if do |hash|
+            unless (thread = hash.fetch(:thread)).alive?
+              thread.join
+              working.delete(hash.fetch(:socket))
             end
           end
 
-          logger.debug { sign_message("Thread cleanup - #{@threads.size} - complete") }
+          logger.debug { sign_message("Thread cleanup - #{threads.size} - complete") }
         end
 
         def log_signature
-          @_log_signature ||= "server-#{self.class.name}"
+          @_log_signature ||= "[server-#{self.class.name}]"
         end
 
         def new_worker(socket)
@@ -48,64 +68,54 @@ module Protobuf
 
         def run
           logger.debug { sign_message("Run") }
-          host = @options[:host]
-          port = @options[:port]
-          backlog = @options[:backlog]
-          @threshold = @options[:threshold]
-
-          @threads = []
-          @server = ::TCPServer.new(host, port)
-          raise "The server was unable to start properly." if @server.closed?
-
-          @server.listen(backlog)
-          @working = []
-          @listen_fds = [@server]
-          @running = true
-
-          while running?
-            logger.debug { sign_message("Waiting for connections") }
-            ready_cnxns = IO.select(@listen_fds, [], [], AUTO_COLLECT_TIMEOUT) rescue nil
-
-            if ready_cnxns
-              cnxns = ready_cnxns.first
-              cnxns.each do |client|
-                case
-                when !running? then
-                  # no-op
-                when client == @server then
-                  logger.debug { sign_message("Accepted new connection") }
-                  client, sockaddr = @server.accept
-                  @listen_fds << client
-                else
-                  unless @working.include?(client)
-                    @working << @listen_fds.delete(client)
-                    logger.debug { sign_message("Working")  }
-                    @threads << { :thread => new_worker(client), :socket => client }
-
-                    cleanup_threads if cleanup?
+
+          server = ::TCPServer.new(host, port)
+          fail "The server was unable to start properly." if server.closed?
+
+          begin
+            server.listen(backlog)
+            listen_fds = [server]
+            self.running = true
+
+            while running?
+              logger.debug { sign_message("Waiting for connections") }
+              ready_cnxns = begin
+                IO.select(listen_fds, [], [], AUTO_COLLECT_TIMEOUT)
+              rescue IOError
+                nil
+              end
+
+              if ready_cnxns
+                ready_cnxns.first.each do |client|
+                  case
+                  when !running?
+                    # no-op
+                  when client == server
+                    logger.debug { sign_message("Accepted new connection") }
+                    client, _sockaddr = server.accept
+                    listen_fds << client
+                  else
+                    unless working.include?(client)
+                      working << listen_fds.delete(client)
+                      logger.debug { sign_message("Working")  }
+                      threads << { :thread => new_worker(client), :socket => client }
+
+                      cleanup_threads if cleanup?
+                    end
                   end
                 end
+              else
+                # Run a cleanup if select times out while waiting
+                cleanup_threads if threads.size > 1
               end
-            else
-              # Run a cleanup if select times out while waiting
-              cleanup_threads if @threads.size > 1
             end
+          ensure
+            server.close
           end
-
-        rescue Errno::EADDRINUSE
-          raise
-        rescue
-          # Closing the server causes the loop to raise an exception here
-          raise #if running?
-        end
-
-        def running?
-          !!@running
         end
 
         def stop
-          @running = false
-          @server.try(:close)
+          self.running = false
         end
       end
     end

data/lib/protobuf/rpc/servers/socket/worker.rb

@@ -33,7 +33,7 @@ module Protobuf
         end
 
         def send_data(data)
-          raise 'Socket closed unexpectedly' unless socket_writable?
+          fail 'Socket closed unexpectedly' unless socket_writable?
           response_buffer = Protobuf::Rpc::Buffer.new(:write)
           response_buffer.set_data(data)
 
@@ -44,7 +44,7 @@ module Protobuf
         end
 
         def log_signature
-          @_log_signature ||= "server-#{self.class}-#{object_id}"
+          @_log_signature ||= "[server-#{self.class}-#{object_id}]"
         end
 
         def socket_writable?

data/lib/protobuf/rpc/servers/socket_runner.rb

@@ -2,8 +2,14 @@ module Protobuf
   module Rpc
     class SocketRunner
 
+      private
+
+      attr_accessor :server
+
+      public
+
       def initialize(options)
-        @options = case
+        options = case
                    when options.is_a?(OpenStruct) then
                      options.marshal_dump
                    when options.is_a?(Hash) then
@@ -11,23 +17,23 @@ module Protobuf
                    when options.respond_to?(:to_hash) then
                      options.to_hash
                    else
-                     raise "Cannot parser Socket Server - server options"
+                     fail "Cannot parser Socket Server - server options"
                    end
 
-        @server = ::Protobuf::Rpc::Socket::Server.new(@options)
+        self.server = ::Protobuf::Rpc::Socket::Server.new(options)
       end
 
       def run
         yield if block_given?
-        @server.run
+        server.run
       end
 
       def running?
-        @server.running?
+        server.running?
       end
 
       def stop
-        @server.stop
+        server.stop
       end
     end
   end