YUKI Hiroshi
null+****@clear*****
Thu Jul 31 12:17:24 JST 2014
YUKI Hiroshi 2014-07-31 12:17:24 +0900 (Thu, 31 Jul 2014) New Revision: 59e4aafc542c151636eae53551601fdfe3bfdc9f https://github.com/droonga/drnbench/commit/59e4aafc542c151636eae53551601fdfe3bfdc9f Message: Report client id separatelly Modified files: lib/drnbench/client/http.rb lib/drnbench/request-response/result.rb Modified: lib/drnbench/client/http.rb (+7 -3) =================================================================== --- lib/drnbench/client/http.rb 2014-07-31 12:11:37 +0900 (92f84ec) +++ lib/drnbench/client/http.rb 2014-07-31 12:17:24 +0900 (5d6b4f0) @@ -55,14 +55,16 @@ module Drnbench :request => request, :status => response.code, :elapsed_time => Time.now - start_time, - :index => "#{@id}-#{@count}", + :client => @id, + :index => @count, } rescue Timeout::Error @result << { :request => request, :status => "0", :elapsed_time => Time.now - start_time, - :index => "#{@id}-#{@count}", + :client => @id, + :index => @count, } end @last_request = nil @@ -82,7 +84,9 @@ module Drnbench :request => @last_request, :status => "0", :elapsed_time => Time.now - @last_start_time, - :index => "#{@id}-#{@count}(last)", + :client => @id, + :index => @count, + :last => true, } end end Modified: lib/drnbench/request-response/result.rb (+11 -4) =================================================================== --- lib/drnbench/request-response/result.rb 2014-07-31 12:11:37 +0900 (680bd21) +++ lib/drnbench/request-response/result.rb 2014-07-31 12:17:24 +0900 (cf0b372) @@ -90,9 +90,16 @@ module Drnbench if status.zero? status = "#{status}(aborted)" end - "#{result[:elapsed_time]} sec: " + - "#{request["method"]} #{status} #{result[:index]} " + - "http://#{request["host"]}:#{request["port"]}#{request["path"]}" + index = result[:index] + index = "#{index}(last)" if result[:last] + [ + "#{result[:elapsed_time]} sec:", + request["method"], + status, + result[:client], + index, + "http://#{request["host"]}:#{request["port"]}#{request["path"]}", + ].join(" ") end end @@ -114,7 +121,7 @@ module Drnbench " max: #{max_elapsed_time} sec\n" + " average: #{average_elapsed_time} sec\n" + "Top #{@n_slow_requests} slow requests:\n" + - " [time: method status index url]\n" + + " [time: method status client index url]\n" + top_slow_requests.collect do |request| " #{request}" end.join("\n") -------------- next part -------------- HTML����������������������������... 下載