From 85bafe636b2d5086155c59a146ab0f83ad33528d Mon Sep 17 00:00:00 2001 From: Dean Karn Date: Wed, 16 Aug 2023 12:04:13 -0700 Subject: [PATCH] update error dep --- CHANGELOG.md | 9 +++++++-- README.md | 2 +- errors.go | 9 +++++---- go.mod | 2 +- go.sum | 4 ++-- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0a80b9..a3d6a87 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -## [8.1.0] - 2023-08-16 +## [8.1.1] - 2023-08-16 +### Fixed +- errors.Link output in error function after updating dependency. + +## [8.1.0] - 2023-08-15 ### Added - log.G as shorthand for adding a set of Grouped fields. This ability has always been present but is now fully supported in the default logger and with helper function for ease of use. - slog support added in Go 1.21+ both to use as an slog.Handler or redirect. @@ -42,7 +46,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Removed ability to remove individual log levels externally; RemoveHandler+AddHandler can do the same. -[Unreleased]: https://github.com/go-playground/log/compare/v8.1.0...HEAD +[Unreleased]: https://github.com/go-playground/log/compare/v8.1.1...HEAD +[8.1.1]: https://github.com/go-playground/log/compare/v8.1.1...v8.1.1 [8.1.0]: https://github.com/go-playground/log/compare/v8.0.2...v8.1.0 [8.0.2]: https://github.com/go-playground/log/compare/v8.0.1...v8.0.2 [8.0.1]: https://github.com/go-playground/log/compare/v8.0.0...v8.0.1 diff --git a/README.md b/README.md index 4c8fac3..86ae232 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ## log -![Project status](https://img.shields.io/badge/version-8.1.0-green.svg) +![Project status](https://img.shields.io/badge/version-8.1.1-green.svg) [![Test](https://github.com/go-playground/log/actions/workflows/go.yml/badge.svg)](https://github.com/go-playground/log/actions/workflows/go.yml) [![Coverage Status](https://coveralls.io/repos/github/go-playground/log/badge.svg?branch=master)](https://coveralls.io/github/go-playground/log?branch=master) [![Go Report Card](https://goreportcard.com/badge/github.com/go-playground/log)](https://goreportcard.com/report/github.com/go-playground/log) diff --git a/errors.go b/errors.go index 7855d40..736e6b0 100644 --- a/errors.go +++ b/errors.go @@ -2,10 +2,10 @@ package log import ( "fmt" + "github.com/go-playground/errors/v5" "strconv" "strings" - "github.com/go-playground/errors/v5" runtimeext "github.com/go-playground/pkg/v5/runtime" ) @@ -102,11 +102,12 @@ func formatLink(l *errors.Link, b []byte) []byte { b = extractSource(b, l.Source) if l.Prefix != "" { b = append(b, l.Prefix...) - - if l.Err != nil { + } + if l.Err != nil { + if l.Prefix != "" { b = append(b, ": "...) - b = append(b, l.Err.Error()...) } + b = append(b, l.Err.Error()...) } return b } diff --git a/go.mod b/go.mod index 541866c..866a3e7 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/go-playground/log/v8 go 1.18 require ( - github.com/go-playground/errors/v5 v5.3.1 + github.com/go-playground/errors/v5 v5.3.2 github.com/go-playground/pkg/v5 v5.21.2 golang.org/x/term v0.11.0 ) diff --git a/go.sum b/go.sum index 199d2da..aa75bae 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,5 @@ -github.com/go-playground/errors/v5 v5.3.1 h1:J2qU+9Whg863g3SATXKSJyFA91Zz85pYD3+obr5Oodk= -github.com/go-playground/errors/v5 v5.3.1/go.mod h1:LcLhmzQ/RuEntAs9r38NSV+xtbHffhMx/1yuuEroc7M= +github.com/go-playground/errors/v5 v5.3.2 h1:B3fsF2CAUrc9XI6L95MtEs20qC5q5tPEFgNBGDwhZMc= +github.com/go-playground/errors/v5 v5.3.2/go.mod h1:LcLhmzQ/RuEntAs9r38NSV+xtbHffhMx/1yuuEroc7M= github.com/go-playground/pkg/v5 v5.21.2 h1:DgVr88oMI3pfMFkEN9E6hp9YGG8NHc+019LRJfnUOfU= github.com/go-playground/pkg/v5 v5.21.2/go.mod h1:UgHNntEQnMJSygw2O2RQ3LAB0tprx81K90c/pOKh7cU= golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=