YUKI Hiroshi
null+****@clear*****
Thu Jan 16 11:56:32 JST 2014
YUKI Hiroshi 2014-01-16 11:56:32 +0900 (Thu, 16 Jan 2014) New Revision: d2fda10ff1b231ff7cbe4323e048fe488b128a86 https://github.com/droonga/drnbench/commit/d2fda10ff1b231ff7cbe4323e048fe488b128a86 Message: Define default host and port via command line parameters Modified files: bin/drnbench lib/drnbench/client/http.rb lib/drnbench/runner.rb Modified: bin/drnbench (+10 -8) =================================================================== --- bin/drnbench 2014-01-16 11:46:09 +0900 (13e8212) +++ bin/drnbench 2014-01-16 11:56:32 +0900 (5964127) @@ -10,6 +10,8 @@ options = { :end_n_clients => 1, :step => 1, :mode => :http, + :default_host => "localhost", + :default_port => 80, :report_progressively => true, :output_path => "/tmp/drnbench-result.csv", } @@ -47,21 +49,21 @@ option_parser = OptionParser.new do |parser| options[:request_patterns_file] = File.expand_path(path) end - parser.on("--host=HOST", String, + parser.on("--default-host=HOST", String, "default host name (optional)") do |host| - options[:host] = host + options[:default_host] = host end - parser.on("--port=PORT", Integer, + parser.on("--default-port=PORT", Integer, "default port number (optional)") do |port| - options[:port] = port + options[:default_port] = port end - parser.on("--path=PATH", String, + parser.on("--default-path=PATH", String, "default path (optional)") do |path| - options[:path] = path + options[:default_path] = path end - parser.on("--method=METHOD", String, + parser.on("--default-method=METHOD", String, "default HTTP method (optional)") do |method| - options[:method] = method + options[:default_method] = method end parser.on("--output-path=PATH", Modified: lib/drnbench/client/http.rb (+4 -4) =================================================================== --- lib/drnbench/client/http.rb 2014-01-16 11:46:09 +0900 (9669899) +++ lib/drnbench/client/http.rb 2014-01-16 11:56:32 +0900 (7689481) @@ -16,10 +16,10 @@ module Drnbench @result = params[:result] @wait = params[:wait] - @default_host = params[:host] - @default_port = params[:port] - @default_path = params[:path] || DEFAULT_PATH - @default_method = params[:method] || DEFAULT_METHOD + @default_host = params[:default_host] + @default_port = params[:default_port] + @default_path = params[:default_path] || DEFAULT_PATH + @default_method = params[:default_method] || DEFAULT_METHOD end def run Modified: lib/drnbench/runner.rb (+0 -5) =================================================================== --- lib/drnbench/runner.rb 2014-01-16 11:46:09 +0900 (aacea26) +++ lib/drnbench/runner.rb 2014-01-16 11:56:32 +0900 (5a20a1d) @@ -15,16 +15,11 @@ module Drnbench DEFAULT_N_CLIENTS = 1 TOTAL_N_REQUESTS = 1000 - DEFAULT_HOST = "localhost" - DEFAULT_PORT = 80 - def initialize(params) @duration = [params[:duration] || DEFAULT_DURATION, MIN_DURATION].max @n_clients = params[:n_clients] || DEFAULT_N_CLIENTS @n_requests = params[:n_requests] || TOTAL_N_REQUESTS - params[:host] ||= DEFAULT_HOST - params[:port] ||= DEFAULT_PORT params[:wait] ||= DEFAULT_WAIT params[:wait] = [params[:wait], MIN_WAIT].max -------------- next part -------------- HTML����������������������������...Download