From 0ef064cc55b01b11346ffa4d1eb7911c4b876609 Mon Sep 17 00:00:00 2001 From: "Gerasimos (Makis) Maropoulos" Date: Mon, 7 Sep 2020 01:08:19 +0300 Subject: [PATCH] update golog dependency --- _examples/logging/json-logger/main.go | 16 +++------------- _examples/logging/json-logger/main_test.go | 2 +- go.mod | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/_examples/logging/json-logger/main.go b/_examples/logging/json-logger/main.go index c3e8b33e..47f7a90c 100644 --- a/_examples/logging/json-logger/main.go +++ b/_examples/logging/json-logger/main.go @@ -10,7 +10,9 @@ import ( func main() { app := iris.New() app.Logger().SetLevel("debug") - app.Logger().Handle(golog.JSON(" ")) /* see below to manually create a handler */ + app.Logger().SetFormat("json", " ") + // to register a custom Formatter: + // app.Logger().RegisterFormatter(golog.Formatter...) // Also, see app.Logger().SetLevelOutput(level string, w io.Writer) // to set a custom writer for a specific level. @@ -79,15 +81,3 @@ func ping(ctx iris.Context) { ctx.WriteString("pong") } - -/* Manually. Use it for any custom format: -func jsonOutput(l *golog.Log) bool { - // you can change the output to a file as well. - enc := json.NewEncoder(l.Logger.GetLevelOutput(l.Level.String())) - enc.SetIndent("", " ") - err := enc.Encode(l) - return err == nil -} - -app.Logger().Handle(jsonOutput) -*/ diff --git a/_examples/logging/json-logger/main_test.go b/_examples/logging/json-logger/main_test.go index 3ce343a0..cc1ea72f 100644 --- a/_examples/logging/json-logger/main_test.go +++ b/_examples/logging/json-logger/main_test.go @@ -30,7 +30,7 @@ func TestJSONLogger(t *testing.T) { app.Get("/ping", ping) - const expectedLogStr = `{"level":"debug","message":"Request path: /ping","fields":{"request_id":null},"stacktrace":[{"function":"json-logger/ping","source":"C:/mygopath/src/github.com/kataras/iris/_examples/logging/json-logger/main.go:76"}]}` + const expectedLogStr = `{"level":"debug","message":"Request path: /ping","fields":{"request_id":null},"stacktrace":[{"function":"json-logger/ping","source":"C:/mygopath/src/github.com/kataras/iris/_examples/logging/json-logger/main.go:78"}]}` e := httptest.New(t, app, httptest.LogLevel("debug")) wg := new(sync.WaitGroup) wg.Add(iters) diff --git a/go.mod b/go.mod index b050cc27..3b31740c 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/iris-contrib/schema v0.0.6 github.com/json-iterator/go v1.1.10 github.com/kataras/blocks v0.0.3 - github.com/kataras/golog v0.1.4 + github.com/kataras/golog v0.1.5 github.com/kataras/neffos v0.0.16 github.com/kataras/pio v0.0.10 github.com/kataras/sitemap v0.0.5