From ae12fd1021f712b2a41b340b84ae2bf718ec2d59 Mon Sep 17 00:00:00 2001 From: Asim Aslam Date: Thu, 19 Dec 2019 18:25:22 +0000 Subject: [PATCH] update crap logging --- debug/log/log.go | 4 +++- debug/service/client.go | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debug/log/log.go b/debug/log/log.go index 3d2a123b..bf90a999 100644 --- a/debug/log/log.go +++ b/debug/log/log.go @@ -3,6 +3,7 @@ package log import ( "encoding/json" + "fmt" "time" ) @@ -46,7 +47,8 @@ type FormatFunc func(Record) string // TextFormat returns text format func TextFormat(r Record) string { - return r.Message.(string) + t := r.Timestamp.Format("2006-01-02 15:04:05") + return fmt.Sprintf("%s %v", t, r.Message) } // JSONFormat is a json Format func diff --git a/debug/service/client.go b/debug/service/client.go index e7d14fda..89209955 100644 --- a/debug/service/client.go +++ b/debug/service/client.go @@ -3,7 +3,6 @@ package service import ( "context" - "fmt" "time" "github.com/micro/go-micro/client" @@ -34,7 +33,7 @@ func (d *debugClient) Log(since time.Time, count int, stream bool) (log.Stream, // get the log stream serverStream, err := d.Client.Log(context.Background(), req) if err != nil { - return nil, fmt.Errorf("failed getting log stream: %s", err) + return nil, err } lg := &logStream{