sanford 0.6.2 → 0.6.3

data/bench/client.rb

@@ -16,6 +16,7 @@ module Bench
       connection = Sanford::Protocol::Connection.new(socket)
       request = Sanford::Protocol::Request.new(version, name, params)
       connection.write(request.to_hash)
+      connection.close_write
       if IO.select([ socket ], nil, nil, 10)
         Sanford::Protocol::Response.parse(connection.read)
       else

data/bench/report.txt

@@ -2,37 +2,36 @@ Running benchmark report...
 
 Hitting "simple" service with {}, 10000 times
 ....................................................................................................
-Total Time:   8960.5727ms
-Average Time:    0.8960ms
-Min Time:        0.5099ms
-Max Time:       87.5380ms
+Total Time:   8171.4835ms
+Average Time:    0.8171ms
+Min Time:        0.5269ms
+Max Time:       91.8741ms
 
 Distribution (number of requests):
-  0ms: 9775
-    0.5ms: 5723
-    0.6ms: 2810
-    0.7ms: 733
-    0.8ms: 364
-    0.9ms: 145
-  1ms: 153
-    1.0ms: 57
-    1.1ms: 18
-    1.2ms: 42
-    1.3ms: 13
-    1.4ms: 8
-    1.5ms: 7
-    1.6ms: 2
-    1.7ms: 3
-    1.8ms: 2
-    1.9ms: 1
-  2ms: 16
-  3ms: 1
-  22ms: 1
-  44ms: 10
-  45ms: 25
-  46ms: 9
-  47ms: 4
-  85ms: 3
-  87ms: 3
+  0ms: 9861
+    0.5ms: 5432
+    0.6ms: 3268
+    0.7ms: 727
+    0.8ms: 291
+    0.9ms: 143
+  1ms: 102
+    1.0ms: 47
+    1.1ms: 30
+    1.2ms: 15
+    1.3ms: 7
+    1.4ms: 1
+    1.6ms: 1
+    1.7ms: 1
+  2ms: 7
+  3ms: 2
+  4ms: 5
+  47ms: 1
+  56ms: 1
+  85ms: 5
+  86ms: 4
+  88ms: 1
+  89ms: 3
+  90ms: 3
+  91ms: 5
 
 Done running benchmark report

data/lib/sanford/server.rb

@@ -73,6 +73,10 @@ module Sanford
         @connection.peek(@timeout)
       end
 
+      def close_write
+        @connection.close_write
+      end
+
     end
 
     module TCPCork

data/lib/sanford/version.rb

@@ -1,3 +1,3 @@
 module Sanford
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/lib/sanford/worker.rb

@@ -25,7 +25,7 @@ module Sanford
       benchmark = Benchmark.measure do
         processed_service = self.run!
       end
-      processed_service.time_taken = self.round_time(benchmark.real)
+      processed_service.time_taken = RoundedTime.new(benchmark.real)
       self.log_complete(processed_service)
       self.raise_if_debugging!(processed_service.exception)
       processed_service
@@ -61,6 +61,7 @@ module Sanford
         service = self.handle_exception(service, exception)
         @connection.write_data service.response.to_hash
       end
+      @connection.close_write
       service
     end
 
@@ -77,65 +78,63 @@ module Sanford
     end
 
     def log_received
-      self.logger.verbose.info("===== Received request =====")
+      log_verbose "===== Received request ====="
     end
 
     def log_request(request)
-      self.logger.verbose.info("  Version: #{request.version.inspect}")
-      self.logger.verbose.info("  Service: #{request.name.inspect}")
-      self.logger.verbose.info("  Params:  #{request.params.inspect}")
+      log_verbose "  Version: #{request.version.inspect}"
+      log_verbose "  Service: #{request.name.inspect}"
+      log_verbose "  Params:  #{request.params.inspect}"
     end
 
     def log_handler_class(handler_class)
-      self.logger.verbose.info("  Handler: #{handler_class}")
+      log_verbose "  Handler: #{handler_class}"
     end
 
     def log_complete(processed_service)
-      self.logger.verbose.info "===== Completed in #{processed_service.time_taken}ms " \
-        "#{processed_service.response.status} ====="
-      self.logger.summary.info self.summary_line(processed_service).to_s
+      log_verbose "===== Completed in #{processed_service.time_taken}ms " \
+                  "#{processed_service.response.status} ====="
+      summary_line_args = {
+        'time'    => processed_service.time_taken,
+        'handler' => processed_service.handler_class
+      }
+      if processed_service.response
+        summary_line_args['status'] = processed_service.response.code
+      end
+      if (request = processed_service.request)
+        summary_line_args['version'] = request.version
+        summary_line_args['service'] = request.name
+        summary_line_args['params']  = request.params
+      end
+      log_summary SummaryLine.new(summary_line_args)
     end
 
     def log_exception(exception)
-      self.logger.verbose.error("#{exception.class}: #{exception.message}")
-      self.logger.verbose.error(exception.backtrace.join("\n"))
+      log_verbose("#{exception.class}: #{exception.message}", :error)
+      log_verbose(exception.backtrace.join("\n"), :error)
     end
 
-    def summary_line(processed_service)
-      SummaryLine.new.tap do |line|
-        if (request = processed_service.request)
-          line.add 'version', request.version
-          line.add 'service', request.name
-          line.add 'params',  request.params
-        end
-        line.add 'handler',   processed_service.handler_class
-        line.add 'status',    processed_service.response.code if processed_service.response
-        line.add 'duration',  processed_service.time_taken
-      end
+    def log_verbose(message, level = :info)
+      self.logger.verbose.send(level, "[Sanford] #{message}")
     end
 
-    ROUND_PRECISION = 2
-    ROUND_MODIFIER = 10 ** ROUND_PRECISION
-    def round_time(time_in_seconds)
-      (time_in_seconds * 1000 * ROUND_MODIFIER).to_i / ROUND_MODIFIER.to_f
+    def log_summary(message, level = :info)
+      self.logger.summary.send(level, "[Sanford] #{message}")
     end
 
-    class SummaryLine
-
-      def initialize
-        @hash = {}
-      end
-
-      def add(key, value)
-        @hash[key] = value.inspect if value
+    module RoundedTime
+      ROUND_PRECISION = 2
+      ROUND_MODIFIER = 10 ** ROUND_PRECISION
+      def self.new(time_in_seconds)
+        (time_in_seconds * 1000 * ROUND_MODIFIER).to_i / ROUND_MODIFIER.to_f
       end
+    end
 
-      def to_s
-        [ 'version', 'service', 'handler', 'status', 'duration', 'params' ].map do |key|
-          "#{key}=#{@hash[key]}" if @hash[key]
-        end.compact.join(" ")
+    module SummaryLine
+      def self.new(line_attrs)
+        attr_keys = %w{time status handler version service params}
+        attr_keys.map{ |k| "#{k}=#{line_attrs[k].inspect}" }.join(' ')
       end
-
     end
 
   end

data/test/support/fake_connection.rb

@@ -1,6 +1,6 @@
 class FakeConnection
 
-  attr_reader :read_data, :response
+  attr_reader :read_data, :response, :write_stream_closed
 
   def self.with_request(version, name, params = {}, raise_on_write = false)
     request = Sanford::Protocol::Request.new(version, name, params)
@@ -29,4 +29,8 @@ class FakeConnection
     @response = Sanford::Protocol::Response.parse(data)
   end
 
+  def close_write
+    @write_stream_closed = true
+  end
+
 end

data/test/support/services.rb

@@ -16,7 +16,7 @@ class TestHost
   logger(Logger.new(File.expand_path("../../../log/test.log", __FILE__)).tap do |logger|
     logger.level = Logger::DEBUG
   end)
-  verbose_logging true
+  verbose_logging false
 
   error do |exception, host_data, request|
     if exception.kind_of?(::MyCustomError)

data/test/support/simple_client.rb

@@ -47,6 +47,7 @@ class SimpleClient
     connection = Sanford::Protocol::Connection.new(socket)
     sleep(@delay) if @delay
     socket.send(bytes, 0)
+    socket.close_write
     Sanford::Protocol::Response.parse(connection.read)
   ensure
     socket.close rescue false

data/test/system/request_handling_test.rb

@@ -40,6 +40,12 @@ class RequestHandlingTest < Assert::Context
       assert_equal 'test',  response.data
     end
 
+    should "have cloased the connection's write stream" do
+      assert_nothing_raised{ @worker.run }
+
+      assert_equal true, @connection.write_stream_closed
+    end
+
   end
 
   class MissingServiceVersionTest < FakeConnectionTest

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sanford
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 6
-  - 2
-  version: 0.6.2
+  - 3
+  version: 0.6.3
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-03-04 00:00:00 Z
+date: 2013-03-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false