Kouhei Sutou
null+****@clear*****
Thu Jan 16 15:57:33 JST 2014
Kouhei Sutou 2014-01-16 15:57:33 +0900 (Thu, 16 Jan 2014) New Revision: b50e31ee19bc42a8ef06681eca373898536d2049 https://github.com/droonga/drntest/commit/b50e31ee19bc42a8ef06681eca373898536d2049 Message: Move config_dir to Engine Modified files: lib/drntest/engine.rb lib/drntest/test-runner.rb Modified: lib/drntest/engine.rb (+5 -4) =================================================================== --- lib/drntest/engine.rb 2014-01-16 15:52:13 +0900 (82c42cf) +++ lib/drntest/engine.rb 2014-01-16 15:57:33 +0900 (1ba37d5) @@ -20,10 +20,11 @@ require "fileutils" module Drntest class Engine - attr_reader :config_dir, :fluentd, :fluentd_options + attr_reader :fluentd, :fluentd_options def initialize(params) - @config_dir = Pathname(params[:config_dir]) + @base_path = params[:base_path] + @config_dir = params[:config_dir] @default_port = params[:default_port] @default_host = params[:default_host] @default_tag = params[:default_tag] @@ -41,11 +42,11 @@ module Drntest end def config_file - config_dir + "fluentd.conf" + @config_dir + "fluentd.conf" end def catalog_file - config_dir + "catalog.json" + @config_dir + "catalog.json" end def port Modified: lib/drntest/test-runner.rb (+2 -1) =================================================================== --- lib/drntest/test-runner.rb 2014-01-16 15:52:13 +0900 (1c95767) +++ lib/drntest/test-runner.rb 2014-01-16 15:57:33 +0900 (8202f5e) @@ -33,7 +33,8 @@ module Drntest @owner = owner @base_path = Pathname(owner.base_path) @target_path = Pathname(target) - @engine = Engine.new(:config_dir => config_dir, + @engine = Engine.new(:base_path => @base_path, + :config_dir => config_dir, :default_port => @owner.port, :default_host => @owner.host, :default_tag => @owner.tag, -------------- next part -------------- HTML����������������������������...Download