Changeset 2461
- Timestamp:
- 10/04/05 23:52:57 (3 years ago)
- Files:
-
- tools/gauge/lib/gauge/base.rb (modified) (1 diff)
- tools/gauge/lib/gauge/log_reader.rb (added)
- tools/gauge/lib/gauge/log_writer.rb (modified) (1 diff)
- tools/gauge/lib/gauge/sequential_log.rb (modified) (1 diff)
- tools/gauge/test/base_test.rb (modified) (4 diffs)
- tools/gauge/test/log_reader_test.rb (added)
- tools/gauge/test/log_writer_test.rb (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
tools/gauge/lib/gauge/base.rb
r2460 r2461 37 37 @@hooks[event.to_sym].each do |name, callback| 38 38 result = callback.call(name, data) 39 40 name = name.to_s 41 length = 13 + name.length + 4 + result.length 42 record = [ 43 length, Time.now.to_f, $$, name.length, name, result.length, result 44 ].pack("NGNCa*Na*") 45 46 logger.write(record) 39 logger.record(name, callback.call(name, data)) 47 40 end 48 41 end tools/gauge/lib/gauge/log_writer.rb
r2460 r2461 12 12 end 13 13 14 def write(data)14 def record(name, data) 15 15 self.next! if number && size >= max_size 16 @io.write(data) 16 17 name = name.to_s 18 length = 13 + name.length + data.length 19 record = [ 20 length, Time.now.to_f, $$, name.length, name, data 21 ].pack("NGNCa*a*") 22 23 @io.write(record) 17 24 end 18 25 tools/gauge/lib/gauge/sequential_log.rb
r2459 r2461 16 16 end 17 17 18 @io.pos = options[:position] || 0 18 @io.pos = options[:position] || 0 if @io 19 19 end 20 20 tools/gauge/test/base_test.rb
r2454 r2461 58 58 io = StringIO.new(@log.string) 59 59 length = io.read(4).unpack("N").first 60 assert_equal 21, length60 assert_equal 17, length 61 61 time, pid, nlen = io.read(13).unpack("GNC") 62 62 assert_equal now.to_i, time.to_i … … 64 64 assert_equal 4, nlen 65 65 assert_equal "demo", io.read(4) 66 assert_equal 0, io.read(4).unpack("N").first67 66 assert io.eof? 68 67 end … … 74 73 io = StringIO.new(@log.string) 75 74 length = io.read(4).unpack("N").first 76 assert_equal 2 9, length75 assert_equal 25, length 77 76 time, pid, nlen = io.read(13).unpack("GNC") 78 77 assert_equal now.to_i, time.to_i … … 80 79 assert_equal 4, nlen 81 80 assert_equal "demo", io.read(4) 82 assert_equal 8, io.read(4).unpack("N").first 83 assert_equal "\005hello\001\002", io.read(8) 81 assert_equal "\005hello\001\002", io.read 84 82 assert io.eof? 85 83 end tools/gauge/test/log_writer_test.rb
r2460 r2461 38 38 logger = Gauge::LogWriter.new("testing", io) 39 39 assert_nil logger.number 40 logger. write"hello"41 assert_ equal "hello", io.string40 logger.record "testing", "hello" 41 assert_match %r{testing.*hello}, io.string 42 42 end 43 43 … … 64 64 :max_size => 0) 65 65 assert_equal 1, logger.number 66 logger. write"hello"66 logger.record "testing", "hello" 67 67 assert_equal 2, logger.number 68 assert_ equal "hello", File.read("#{FIXTURES}/logger/existing/testing-0002.log")68 assert_match %r{testing.*hello}, File.read("#{FIXTURES}/logger/existing/testing-0002.log") 69 69 ensure 70 70 File.delete("#{FIXTURES}/logger/existing/testing-0002.log") rescue nil
