logm 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b37bad66d2bc88ce8a74a9f3aeba6bb3c61798e9e9288f08c9c4a5c4c2c856f2
-  data.tar.gz: b2fb66145e027580f43bbd527e41a52085b93014cc3719edca2e6ba5980c58f6
+  metadata.gz: e8268e85c780fcb505648e7f36ef915b0b82a253907148a2f95485a690bef294
+  data.tar.gz: 90042d98654e802e6c694de035297c120c2fbc74c65a0d69f95a330d3927a312
 SHA512:
-  metadata.gz: 0af23c512635daaac90546647f6d8fca90d8d60cbb261ec849c1c64a1e0b558ec5ae8861c2df4ed97ff78e929d128b71f5d135434a2c39b6961025b5f300ecfb
-  data.tar.gz: f1c446c3462c3cc8ee961ca8fec576e2f23a82c7d996c78323bb297d7c4da5724ac58b066a8a9bfaccbcd583e26c3577febfb8289d2758ee1f7d1099642d412b
+  metadata.gz: e6966a36051254dee8b55b0196250b4d682f8e136f8da76525dbab6a045953873915d541523827e74f8d6e6b7a4c0760f0758a4da94d1f2fa5ecedb953bfa340
+  data.tar.gz: 3d163efc23ee1868c288074ab553dbc2622fbc8b17b1401213eea97b6e7e77e4e9eddba2988de6274164931b8a2932f3698562fd118cc9f18fd143b49db3e439

data/lib/logmerge.rb

@@ -2,6 +2,8 @@ require 'colored'
 require 'date'
 require 'optparse'
 
+
+
 class Numeric
   def minutes; self/1440.0 end
   alias :minute :minutes
@@ -13,8 +15,27 @@ class Numeric
   alias :millisecond :milliseconds
 end
 
+class File
+  alias :old_initialize :initialize
+  alias :old_readline :readline
+  def initialize (*args)
+    @buf=[]
+    old_initialize(*args)
+  end
+  def unreadline (str)
+    @buf.push(str)
+  end
+  def readline (*args)
+    @buf.empty? ? old_readline(*args) : @buf.pop
+  end
+
+  def buf
+    @buf
+  end
+end
+
 class Log
-  attr_accessor :file, :line, :offet, :tag, :timestamp, :finished
+  attr_accessor :file, :line, :next, :offet, :tag, :timestamp, :next_timestamp, :finished
   def initialize(path)
     @offset = 0
     if path.include?(':')
@@ -30,34 +51,74 @@ class Log
     buffer
   end
 
-  def parseTimestamp(line)
+  def parseTimestamp(current)
+    # puts "parsingTimestamp: #{current}"
     # would be great to generalize this more
-    if line[0] == '['
+    ts = nil
+    if current =~ /^\[\d\d\d\d\/\d\d\/\d\d \d\d:\d\d:\d\d\.\d\d\d\]/
       # agent logs
-      ts = DateTime.parse(line[1...24])
+      ts_part = current[1...24]
+      # puts "ts_part: #{ts_part}"
+      ts = DateTime.parse(ts_part)
       ts = ts + @offset.seconds
-      line[1...24] = ts.to_s
-    else
+    elsif current =~ /^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\d[+-]\d\d\d\d/
       #mms logs
-      ts = DateTime.parse(line[0...28])
+      ts_part = current[0...28]
+      # puts "ts_part: #{ts_part}"
+      ts = DateTime.parse(current[0...28])
       ts = ts + @offset.seconds
-      line[0...28] = "[#{ts.to_s}]"
     end
     ts
+  rescue Date::Error
+    nil
+  end
+
+  def applyTimestamp(current, timestamp)
+    if current =~ /^\[\d\d\d\d\/\d\d\/\d\d \d\d:\d\d:\d\d\.\d\d\d\]/
+      current[1...24] = timestamp.to_s
+    elsif current =~ /^\d\d\d\d-\d\d-\d\dT\d\d:\d\d:\d\d\.\d\d\d[+-]\d\d\d\d/
+      current[0...28] = "[#{timestamp.to_s}]"
+    end
+    current
+  end
+
+  def append(current, timestamp=nil)
+    current.prepend("[#{@tag}]") if @tag && timestamp
+    @line.push(current)
   end
 
   def buffer
-    begin
-      @line = file.readline.strip
-      @timestamp = parseTimestamp(line)
-      line.prepend("[#{@tag}]") if @tag
-    rescue Date::Error
-      @timestamp = nil
+    @count ||= 0
+    # puts "buffer: #{@count}"
+    # puts "file buffer: #{file.buf}"
+    @count = @count + 1
+    # TODO: add support for multiline log statements
+    # basically read until next timestamp found including all lines as an entry
+    @line = []
+    @timestamp = nil
+    timestamp_index = 0
+    while @timestamp.nil? do
+      current = file.readline.strip
+      # puts "current: #{current}"
+      @timestamp = parseTimestamp(current)
+      # puts "timestamp: #{@timestamp}"
+      append(current, @timestamp)
+      timestamp_index = timestamp_index + 1 if @timestamp.nil?
+    end
+
+    applyTimestamp(line[timestamp_index], @timestamp) if line.size > timestamp_index
+
+    next_timestamp = nil
+    while next_timestamp.nil? do
+      current = file.readline.strip
+      # puts "nextcurrent: #{current}"
+      next_timestamp = parseTimestamp(current)
+      # puts "next_timestamp: #{next_timestamp}"
+      file.unreadline(current + "\n") && break unless next_timestamp.nil?
+      append(current)
     end
   rescue EOFError
-    @line = nil
-    @finished = true
-    @timestamp = nil
+    @finished = true if @line.empty?
   end
 
   def take
@@ -88,7 +149,12 @@ class LogMerge
       index = logs.index(min_log)
       color_index = index % colors.size
       color = colors[color_index]
-      puts Colored.colorize(min_log.take, foreground: color)
+      loglines = min_log.take
+      puts applyColor(loglines, color).join("\n")
     end
   end
+
+  def applyColor(loglines, color)
+    loglines.map{|l| Colored.colorize(l, foreground: color)}
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logm
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Peter Vertenten