fix timestamps for lambda plain text logs

apex · Nov 25, 2017 · 42cffcd · 42cffcd
1 parent 4b2b961
commit 42cffcd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/platform/lambda/logs.go b/platform/lambda/logs.go
@@ -2,7 +2,6 @@ package lambda
 
 import (
 	"encoding/json"
-	"fmt"
 	"io"
 	"os"
 	"strings"
@@ -16,7 +15,6 @@ import (
 	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
 	"github.com/tj/go/term"
 
-	"github.com/apex/up/internal/colors"
 	"github.com/apex/up/internal/logs/parser"
 	"github.com/apex/up/internal/logs/text"
 	"github.com/apex/up/internal/util"
@@ -126,7 +124,11 @@ func (l *Logs) start() {
 		}
 
 		// lambda textual logs
-		fmt.Printf("  %s\n", colors.Gray(line))
+		handler.HandleLog(&log.Entry{
+			Timestamp: l.Timestamp,
+			Level:     log.InfoLevel,
+			Message:   strings.TrimRight(l.Message, " \n"),
+		})
 	}
 
 	// TODO: refactor interface to delegate

diff --git a/platform/lambda/logs/log.go b/platform/lambda/logs/log.go
@@ -79,7 +79,9 @@ func (l *Log) fetch(nextToken *string, start int64, ch chan<- *Event) (*string,
 
 	for _, event := range res.Events {
 		start = *event.Timestamp + 1
+		sec := *event.Timestamp / 1000
 		ch <- &Event{
+			Timestamp: time.Unix(sec, 0),
 			GroupName: l.GroupName,
 			Message:   *event.Message,
 		}

diff --git a/platform/lambda/logs/logs.go b/platform/lambda/logs/logs.go
@@ -10,6 +10,7 @@ import (
 
 // Event is a single log event from a group.
 type Event struct {
+	Timestamp time.Time
 	GroupName string
 	Message   string
 }