YUKI Hiroshi
null+****@clear*****
Tue Nov 4 18:59:05 JST 2014
YUKI Hiroshi 2014-11-04 18:59:05 +0900 (Tue, 04 Nov 2014) New Revision: b4945c29388ee0e9cd5fdab4852174016f7d2c71 https://github.com/droonga/droonga-engine/commit/b4945c29388ee0e9cd5fdab4852174016f7d2c71 Message: Ask all configuration values to the user even if their values are given via command line if their values are given via command line options Modified files: bin/droonga-engine-configure lib/droonga/command/droonga_engine.rb Modified: bin/droonga-engine-configure (+4 -4) =================================================================== --- bin/droonga-engine-configure 2014-11-04 18:53:20 +0900 (3c295ba) +++ bin/droonga-engine-configure 2014-11-04 18:59:05 +0900 (53df1d6) @@ -159,19 +159,19 @@ if options[:clear] end if options[:reset_config] or options[:reset_catalog] - if configuration.have_given_host? or options[:no_prompt] + if options[:no_prompt] host = configuration.host else host = input("host", configuration.host) end - if configuration.have_given_port? or options[:no_prompt] + if options[:no_prompt] port = configuration.port else port = input("port", configuration.port).to_i end - if configuration.have_given_tag? or options[:no_prompt] + if options[:no_prompt] tag = configuration.tag else tag = input("tag", configuration.tag) @@ -179,7 +179,7 @@ if options[:reset_config] or options[:reset_catalog] end if options[:reset_config] - if configuration.have_given_log_level? or options[:no_prompt] + if options[:no_prompt] log_level = configuration.log_level else levels = Droonga::Logger::Level::LABELS Modified: lib/droonga/command/droonga_engine.rb (+0 -38) =================================================================== --- lib/droonga/command/droonga_engine.rb 2014-11-04 18:53:20 +0900 (7e94a6c) +++ lib/droonga/command/droonga_engine.rb 2014-11-04 18:59:05 +0900 (7bc138a) @@ -122,8 +122,6 @@ module Droonga @port = config["port"] || Address::DEFAULT_PORT @tag = config["tag"] || Address::DEFAULT_TAG - @given_values = {} - @log_file = nil @daemon = false @pid_file_path = nil @@ -147,34 +145,6 @@ module Droonga File.exist?(Path.config) end - def have_given_host? - @given_values.include?(:host) - end - - def have_given_port? - @given_values.include?(:port) - end - - def have_given_tag? - @given_values.include?(:tag) - end - - def have_given_daemon? - @given_values.include?(:daemon) - end - - def have_given_log_file? - @given_values.include?(:log_file) - end - - def have_given_log_level? - @given_values.include?(:log_level) - end - - def have_given_pid_file? - @given_values.include?(:pid_file) - end - def load_config if have_config_file? YAML.load_file(Path.config) @@ -243,19 +213,16 @@ module Droonga "The host name of the Droonga engine", "(#{@host})") do |host| @host = host - @given_values[:host] = host end parser.on("--port=PORT", Integer, "The port number of the Droonga engine", "(#{@port})") do |port| @port = port - @given_values[:port] = port end parser.on("--tag=TAG", "The tag of the Droonga engine", "(#{@tag})") do |tag| @tag = tag - @given_values[:tag] = tag end end @@ -269,12 +236,10 @@ module Droonga "[#{levels_label}]", "(#{log_level})") do |level| self.log_level = level - @given_values[:log_level] = log_level end parser.on("--log-file=FILE", "Output logs to FILE") do |file| self.log_file = file - @given_values[:log_file] = file end end @@ -284,17 +249,14 @@ module Droonga parser.on("--daemon", "Run as a daemon") do @daemon = true - @given_values[:daemon] = true end parser.on("--no-daemon", "Run as a regular process") do @daemon = false - @given_values[:daemon] = false end parser.on("--pid-file=PATH", "Put PID to PATH") do |path| self.pid_file_path = path - @given_values[:pid_file] = path end end -------------- next part -------------- HTML����������������������������...Download