Merge pull request #4 from kamatama41/update-190715

Update 190715

main.go

@@ -24,20 +24,20 @@ var (
 	limit    = flag.Int("l", 1000, "Number of logs fetched at once.")
 	fromStr  = flag.String("from", "", "Minimum timestamp for requested logs, should be an ISO-8601 string.")
 	toStr    = flag.String("to", "", "Maximum timestamp for requested logs, should be an ISO-8601 string.")
-	version  = flag.Bool("V", false, "Show version of taildog")
+	version  = flag.Bool("version", false, "Show version of taildog.")
 
 	apiKey = getEnv("DD_API_KEY")
 	appKey = getEnv("DD_APP_KEY")
 )
 
 type config struct {
-	query     string
-	from      myTime
-	to        myTime
-	limit     int
-	tmpl      *template.Template
-	nextLogId string
-	follow    bool
+	query    string
+	from     myTime
+	to       myTime
+	limit    int
+	tmpl     *template.Template
+	follow   bool
+	lastInfo *logsInfo
 }
 
 type logsInfo struct {
@@ -76,22 +76,29 @@ func main() {
 		log.Fatal(err)
 	}
 
-	cfg, err = showLogs(cfg)
+	logs, err := showLogs(cfg)
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	for cfg.follow {
 		time.Sleep(time.Duration(*interval) * time.Second)
 
-		cfg, err = showLogs(cfg)
+		err = cfg.update(logs)
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		logs, err = showLogs(cfg)
 		if err != nil {
 			log.Fatal(err)
 		}
 	}
 }
 
-func showLogs(cfg *config) (*config, error) {
+func showLogs(cfg *config) (*logsInfo, error) {
+	//println("$$$ " + cfg.String() + " ::: " + time.Now().String())
+
 	reqBody := map[string]interface{}{
 		"query": cfg.query,
 		"limit": cfg.limit,
@@ -101,8 +108,10 @@ func showLogs(cfg *config) (*config, error) {
 		},
 		"sort": "asc",
 	}
-	if cfg.nextLogId != "" {
-		reqBody["startAt"] = cfg.nextLogId
+
+	lastInfo := cfg.lastInfo
+	if lastInfo.NextLogId != "" {
+		reqBody["startAt"] = lastInfo.NextLogId
 	}
 
 	reqBodyJson, err := json.Marshal(reqBody)
@@ -141,15 +150,28 @@ func showLogs(cfg *config) (*config, error) {
 		return nil, err
 	}
 
+	// Remove duplicate logs
+	var logsToDisplay []logInfo
+FilterLoop:
 	for _, l := range logsInfo.Logs {
+		if lastInfo != nil {
+			for _, lastLog := range lastInfo.Logs {
+				if l.Id == lastLog.Id {
+					continue FilterLoop
+				}
+			}
+			logsToDisplay = append(logsToDisplay, l)
+		}
+	}
+
+	for _, l := range logsToDisplay {
 		err := cfg.tmpl.Execute(os.Stdout, l.Content)
 		if err != nil {
 			return nil, err
 		}
 	}
 
-	err = cfg.update(logsInfo)
-	return cfg, err
+	return logsInfo, err
 }
 
 func getEnv(key string) string {
@@ -214,18 +236,19 @@ func newConfig() (*config, error) {
 	}
 
 	return &config{
-		query:  *query,
-		from:   from,
-		to:     to,
-		limit:  *limit,
-		follow: follow,
-		tmpl:   tmpl,
+		query:    *query,
+		from:     from,
+		to:       to,
+		limit:    *limit,
+		follow:   follow,
+		tmpl:     tmpl,
+		lastInfo: &logsInfo{},
 	}, nil
 }
 
 func (cfg *config) update(info *logsInfo) error {
-	cfg.nextLogId = info.NextLogId
-	if cfg.nextLogId != "" {
+	cfg.lastInfo = info
+	if info.NextLogId != "" {
 		// There are remaining logs (keep last condition)
 		return nil
 	}
@@ -236,14 +259,13 @@ func (cfg *config) update(info *logsInfo) error {
 		if err != nil {
 			return err
 		}
-		// (Timestamp of the last log) + 1ms, to avoid to show duplicate logs
-		cfg.from = t.Add(time.Duration(1 * time.Millisecond))
+		cfg.from = t
 	}
 	cfg.to = now()
 
 	return nil
 }
 
 func (cfg *config) String() string {
-	return fmt.Sprintf("%s %s %s", cfg.from.Format(time.RFC3339Nano), cfg.to.Format(time.RFC3339Nano), cfg.nextLogId)
+	return fmt.Sprintf("%s %s %s", cfg.from.Format(time.RFC3339Nano), cfg.to.Format(time.RFC3339Nano), cfg.lastInfo.NextLogId)
 }

version.go

@@ -1,3 +1,3 @@
 package main
 
-var VERSION = "0.1.2"
+var VERSION = "0.2.0"