@@ -56,22 +56,22 @@ module God # Returns nothing def log(watch, level, text) # initialize watch log if necessary - self.logs[watch.name] ||= Timeline.new(God::LOG_BUFFER_SIZE_DEFAULT) if watch + # self.logs[watch.name] ||= Timeline.new(God::LOG_BUFFER_SIZE_DEFAULT) if watch # push onto capture and timeline for the given watch - @templogio.truncate(0) - @templogio.rewind - @templog.send(level, text % []) - @mutex.synchronize do - @capture.puts(@templogio.string) if @capture - self.logs[watch.name] << [] if watch # [Time.now, @templogio.string] if watch - end + # @templogio.truncate(0) + # @templogio.rewind + # @templog.send(level, text % []) + # @mutex.synchronize do + # @capture.puts(@templogio.string) if @capture + # self.logs[watch.name] << '' if watch # [Time.now, @templogio.string] if watch + # end # send to regular logger - self.send(level, text % []) + # self.send(level, text % []) # send to syslog - Syslog.send(SYSLOG_EQUIVALENTS[level], text) if Logger.syslog + # Syslog.send(SYSLOG_EQUIVALENTS[level], text) if Logger.syslog end # Get all log output for a given Watch since a certain Time. lib/god/logger.rb @@ -1,6 +1,9 @@ module God class Timeline + extend Forwardable + def_delegators :@storage, :clear, :size, :first, :last, :[], :to_ary, :to_a + # Instantiate a new Timeline # +max_size+ is the maximum size to which the timeline should grow # @@ -13,17 +16,20 @@ module God # Push a value onto the Timeline # +val+ is the value to push def push(val) - @storage.concat(val) - @storage.shift if @storage.size > @max_size + @storage.concat([val]) + @storage = @storage[1..-1] if @storage.size > @max_size + # @storage.shift if @storage.size > @max_size end - # Push a value onto the timeline - # +val+ is the value to push - # - # Returns Timeline - def <<(val) - push(val) - end + alias_method :<<, :push + + # # Push a value onto the timeline + # # +val+ is the value to push + # # + # # Returns Timeline + # def <<(val) + # push(val) + # end end end \ No newline at end of file lib/god/timeline.rb @@ -14,7 +14,7 @@ class TestTimeline < Test::Unit::TestCase @timeline.push(i) end - assert_equal [6, 7, 8, 9, 10], @timeline + assert_equal [6, 7, 8, 9, 10], @timeline.to_ary end def test_clear_should_clear_array test/test_timeline.rb 2b8efe7a0b34b8305e287781802e32989a15dc1a tom tom@taco.desk.hq.powerset.com http://github.com/mojombo/god/commit/60487cc2182dd3f0fbc841d7f45afc61ef18ffc5 60487cc2182dd3f0fbc841d7f45afc61ef18ffc5 2008-01-21T16:08:39-08:00 2008-01-21T16:08:39-08:00 changes c6f9fc0392f56e1bf3c62ed25686463284426091 tom tom@taco.desk.hq.powerset.com