@@ -2,6 +2,7 @@ require File.dirname(__FILE__) + "/../../deep_test" options = DeepTest::Options.from_command_line(ENV['OPTIONS']) ENV['DEEP_TEST_LOG_LEVEL'] = options.environment_log_level options.ssh_client_connection_info = DeepTest::Distributed::SshClientConnectionInfo.new + DeepTest.logger.debug { "mirror establish_beachhead for #{options.origin_hostname}" } STDIN.close lib/deep_test/distributed/establish_beachhead.rb @@ -11,10 +11,13 @@ module DeepTest def establish_beachhead(options) command = "#{ssh_command(options)} '#{spawn_command(options)}' 2>&1" - DeepTest.logger.debug { "Establishing Beachhed: #{command}" } + DeepTest.logger.debug { "Establishing Beachhead: #{command}" } output = `#{command}` output.each do |line| + if DeepTest.logger.level == Logger::DEBUG + puts output + end if line =~ /Beachhead port: (.+)/ @wire = Telegraph::Wire.connect(@config[:address], $1.to_i) end lib/deep_test/distributed/landing_ship.rb @@ -2,7 +2,8 @@ module DeepTest class Logger < ::Logger def initialize(*args) super - self.formatter = proc { |severity, time, progname, msg| "[DeepTest] #{time.strftime "%F %T"} #{msg}\n" } + hostname = Socket.gethostname + self.formatter = proc { |severity, time, progname, msg| "[DeepTest@#{hostname}] #{time.strftime "%F %T"} #{msg}\n" } self.level = configured_log_level end lib/deep_test/logger.rb @@ -77,10 +77,10 @@ module DeepTest Timewarp.freeze("2009-09-22 12:01:33") do controller.dispatch(:method_call) assert_equal <<-end_log, DeepTest.logger.logged_output -[DeepTest] 2009-09-22 12:01:33 Exception while dispatching method_call to #{receiver.inspect}: -[DeepTest] 2009-09-22 12:01:33 Exception: message -[DeepTest] 2009-09-22 12:01:33 file1:1 -[DeepTest] 2009-09-22 12:01:33 file2:2 +[DeepTest@#{Socket.gethostname}] 2009-09-22 12:01:33 Exception while dispatching method_call to #{receiver.inspect}: +[DeepTest@#{Socket.gethostname}] 2009-09-22 12:01:33 Exception: message +[DeepTest@#{Socket.gethostname}] 2009-09-22 12:01:33 file1:1 +[DeepTest@#{Socket.gethostname}] 2009-09-22 12:01:33 file2:2 end_log end end test/deep_test/distributed/dispatch_controller_test.rb @@ -8,7 +8,7 @@ module DeepTest test "formatter uses msg only" do time = Time.parse("2009-09-22 12:01:33") - assert_equal "[DeepTest] 2009-09-22 12:01:33 my_msg\n", DeepTest.logger.formatter.call(nil, time, nil, "my_msg") + assert_equal "[DeepTest@#{Socket.gethostname}] 2009-09-22 12:01:33 my_msg\n", DeepTest.logger.formatter.call(nil, time, nil, "my_msg") end Logger::Severity.constants.each do |severity| @@ -17,18 +17,20 @@ module DeepTest assert_raises(ArgumentError) { logger.send severity.downcase, "a" } end + THE_DATE = '\d{4}-\d\d-\d\d \d\d:\d\d:\d\d' unless defined?(THE_DATE) + test "#{severity.downcase} can be called with a block" do logger = Logger.new(out = StringIO.new) logger.level = Logger.const_get(severity) logger.send(severity.downcase) { "a" } - assert_match /\[DeepTest\] \d{4}-\d\d-\d\d \d\d:\d\d:\d\d a\n/, out.string + assert_match /\[DeepTest@#{Socket.gethostname}\] #{THE_DATE} a\n/, out.string end test "#{severity.downcase} rescues errors from block and logs them" do logger = Logger.new(out = StringIO.new) logger.level = Logger.const_get(severity) - logger.send(severity.downcase) { raise Exception, "my error" } - assert_match /\[DeepTest\] \d{4}-\d\d-\d\d \d\d:\d\d:\d\d Exception: my error occurred logging on #{__FILE__}:#{__LINE__ - 1}:in `send'\n/, + logger.send(severity.downcase) { raise Exception, "e" } + assert_match /\[DeepTest@#{Socket.gethostname}\] #{THE_DATE} Exception: e occurred logging on #{__FILE__}:#{__LINE__ - 1}:in `send'\n/, out.string end end test/deep_test/logger_test.rb 76afbb47c31b320675aae280c48606814a9e8f36 qxjit (David Vollbracht) david.vollbracht@gmail.com http://github.com/qxjit/deep-test/commit/34c1802cce3fc9e92a45282f6590679a68d3c51f 34c1802cce3fc9e92a45282f6590679a68d3c51f 2009-08-07T08:44:17-07:00 2009-08-07T08:44:17-07:00 add hostname to log messages 9b5be7cc851fba86ece008cc8419f1823def7783 qxjit (David Vollbracht) david.vollbracht@gmail.com