Merge pull request #50 from k1LoW/unixtime

Support parse 'unixtime'

README.md

@@ -50,7 +50,7 @@ targetSets:
     description: app log
     type: regexp
     regexp: 'time:([^\t]+)'
-    timeFormat: 'Jan 02 15:04:05'
+    timeFormat: 'Jan 02 15:04:05' # Golang time format and 'unixtime'
     timeZone: '+0900'
     sources:
       - 'ssh://app-1.example.com/var/log/ltsv.log*'

client/client.go

@@ -55,6 +55,9 @@ func buildReadCommand(path string, st, et *time.Time, timeFormat, timeZone strin
 	findStart := st.Format("2006-01-02 15:04:05 MST")
 
 	cmd := fmt.Sprintf("sudo find %s/ -type f -name '%s' -newermt '%s' | xargs sudo ls -tr | xargs sudo zcat -f | grep -a '%s'", dir, base, findStart, string(matches))
+	if timeFormat == "unixtime" {
+		cmd = fmt.Sprintf("sudo find %s/ -type f -name '%s' -newermt '%s' | xargs sudo ls -tr | xargs sudo zcat -f", dir, base, findStart)
+	}
 
 	return cmd
 }

parser/parser.go

@@ -3,6 +3,7 @@ package parser
 import (
 	"context"
 	"fmt"
+	"strconv"
 	"time"
 
 	"github.com/k1LoW/harvest/client"
@@ -27,8 +28,12 @@ type Parser interface {
 	Parse(ctx context.Context, cancel context.CancelFunc, lineChan <-chan client.Line, tz string, st *time.Time, et *time.Time) <-chan Log
 }
 
-// parseTime ...
 func parseTime(tf string, tz string, content string) (*time.Time, error) {
+	if tf == "unixtime" {
+		ui, _ := strconv.ParseInt(content, 10, 64)
+		ut := time.Unix(ui, 0)
+		return &ut, nil
+	}
 	if tz == "" {
 		t, err := time.Parse(fmt.Sprintf("2006-01-02 %s", tf), fmt.Sprintf("%s %s", time.Now().Format("2006-01-02"), content))
 		return &t, err