Skip to content
This repository has been archived by the owner on Mar 24, 2023. It is now read-only.

Commit

Permalink
improve logging format
Browse files Browse the repository at this point in the history
  • Loading branch information
laverya committed Apr 22, 2019
1 parent e0c7f24 commit 70cf290
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions pkg/lifecycle/daemon/daemon.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ func (d *ShipDaemon) Serve(ctx context.Context, release *api.Release) error {

g := gin.New()

ginLogger := level.Debug(log.With(d.Logger, "gin", "serve"))
logWriter := loggerWriter(ginLogger)
logWriter := loggerWriter(d.Logger)
g.Use(gin.LoggerWithWriter(logWriter))

g.Use(cors.New(config))
Expand Down Expand Up @@ -173,9 +172,9 @@ func loggerWriter(ginLog log.Logger) *io.PipeWriter {
go func(bufReader *bufio.Reader, ginLog log.Logger) {
for {
line, err := bufReader.ReadString('\n')
ginLog.Log(line)
level.Info(ginLog).Log("event", "gin.log", line, "line")
if err != nil {
ginLog.Log(err.Error())
level.Error(ginLog).Log("event", "gin.log", err, "err")
return
}
}
Expand Down

0 comments on commit 70cf290

Please sign in to comment.