@@ -28,6 +28,7 @@ module DTR DTR.info {"=> Listening port: #{DTR.configuration.agent_listen_port}"} DTR.info {"=> Group: #{DTR.configuration.group}"} DTR.info {"=> Dir.pwd: #{Dir.pwd}"} + DTR.info {"=> Follower listen heartbeat timeout: #{DTR.configuration.follower_listen_heartbeat_timeout}"} end def hypnotize lib/dtr/agent/brain.rb @@ -24,6 +24,7 @@ module DTR DTR.info {""} DTR.info {"--------------------beautiful line--------------------------"} DTR.info {"Master process started at #{Time.now}"} + DTR.info {"Master heartbeat interval: #{DTR.configuration.master_heartbeat_interval}"} DTR.root = Dir.pwd DTR.configuration.with_rinda_server do lib/dtr/master.rb @@ -226,7 +226,7 @@ class GeneralTest < Test::Unit::TestCase suite << ATestCase.suite suite << ATestCase2.suite suite << AFileSystemTestCase.suite - with_agent_helper_group do + with_agent_configuration do result = runit(suite) assert result.passed? assert_equal 3, result.run_count test/acceptance/general_test.rb @@ -5,7 +5,7 @@ include DTR::AgentHelper class RailsExtTest < Test::Unit::TestCase def setup - start_agents(:master_heartbeat_interval => 10, :follower_listen_heartbeat_timeout => 15) + start_agents(:follower_listen_heartbeat_timeout => 15) end def teardown test/acceptance/rails_ext_test.rb @@ -25,7 +25,6 @@ module DTR Process.fork do Dir.chdir(agent_dir) do DTR.configuration.refresh - DTR.configuration.master_heartbeat_interval = options[:master_heartbeat_interval] || 2 DTR.configuration.follower_listen_heartbeat_timeout = options[:follower_listen_heartbeat_timeout] || 3 DTR.configuration.group = GROUP DTR.configuration.agent_runners = runner_names test/agent_helper.rb @@ -30,7 +30,7 @@ module Test pid = Process.fork do Dir.chdir(File.expand_path(File.dirname(__FILE__) + "/../testdata/")) do setup_test_env - with_agent_helper_group(&block) + with_agent_configuration(&block) end exit 0 end @@ -40,8 +40,9 @@ module Test kill_process pid end - def with_agent_helper_group(&block) + def with_agent_configuration(&block) DTR.configuration.group = DTR::AgentHelper::GROUP + DTR.configuration.master_heartbeat_interval = 2 begin block.call ensure test/test_helper.rb 2d926529de42b23e11eb40ff059bb5b57e9e49e1 Li Xiao iam@li-xiao.com http://github.com/xli/dtr/commit/fb3b18500223b4ec1f5109332105fe21fd8aeec0 fb3b18500223b4ec1f5109332105fe21fd8aeec0 2008-11-04T08:02:11-08:00 2008-11-04T08:02:11-08:00 fixed test master process configuration problem which caused long time run test 1647670b43ac796e59d7bdd978981787e7f41b80 Li Xiao iam@li-xiao.com