Start switching to use slog #654
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## main #654 +/- ##
==========================================
- Coverage 74.32% 74.05% -0.27%
==========================================
Files 99 100 +1
Lines 13136 13183 +47
==========================================
Hits 9763 9763
- Misses 2685 2732 +47
Partials 688 688
📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more |
rowanseymour
requested changes
Oct 6, 2023
handlers/jiochat/handler_test.go
Outdated
| @@ -20,6 +20,7 @@ import ( | |||
| "github.com/nyaruka/gocommon/urns" | |||
| "github.com/sirupsen/logrus" | |||
| "github.com/stretchr/testify/assert" | |||
| "golang.org/x/exp/slog" | |||
handlers/wechat/handler_test.go
Outdated
| @@ -20,6 +20,7 @@ import ( | |||
| "github.com/nyaruka/gocommon/urns" | |||
| "github.com/sirupsen/logrus" | |||
| "github.com/stretchr/testify/assert" | |||
| "golang.org/x/exp/slog" | |||
queue/queue.go
Outdated
| @@ -6,7 +6,7 @@ import ( | |||
| "time" | |||
|
|
|||
| "github.com/gomodule/redigo/redis" | |||
| "github.com/sirupsen/logrus" | |||
| "golang.org/x/exp/slog" | |||
server.go
Outdated
| @@ -22,6 +22,7 @@ import ( | |||
| "github.com/nyaruka/gocommon/jsonx" | |||
| "github.com/pkg/errors" | |||
| "github.com/sirupsen/logrus" | |||
| "golang.org/x/exp/slog" | |||
There was a problem hiding this comment.
the golang.org/x/exp is where new experimental features are tried out before sometimes becoming part of the golang std lib - so slog first existed there before being added to go 1.21
There was a problem hiding this comment.
Right, I had not noticed the completion chose that one instead of the std lib one, I guess I have some package not up to date
rowanseymour
reviewed
Oct 6, 2023
cmd/courier/main.go
Outdated
| "os" | ||
| "os/signal" | ||
| goruntime "runtime" |
There was a problem hiding this comment.
this is only necessary in mailroom because we have our own runtime struct
norkans7
force-pushed
the
slog
branch
2 times, most recently
from
be4a311 to
64470aa
Compare
rowanseymour
reviewed
Oct 6, 2023
handlers/jiochat/handler_test.go
Outdated
| @@ -13,6 +13,8 @@ import ( | |||
| "testing" | |||
| "time" | |||
|
|
|||
| "log/slog" | |||
There was a problem hiding this comment.
no space needed between this and other deps - standard go formatting is only a space between std lib deps and other deps
| @@ -25,6 +25,7 @@ github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49P | |||
| github.com/go-chi/chi v4.1.2+incompatible h1:fGFk2Gmi/YKXk0OmGfBh0WgmN3XB8lVnEyNz34tQRec= | |||
| github.com/go-chi/chi v4.1.2+incompatible/go.mod h1:eB3wogJHnLi3x/kFX2A+IbTBlXxmMeXJVKy9tTv1XzQ= | |||
| github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= | |||
| github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= | |||
rowanseymour
approved these changes
Oct 6, 2023
queue/queue.go
Outdated
| @@ -201,7 +201,7 @@ func PopFromQueue(conn redis.Conn, qType string) (WorkerToken, string, error) { | |||
| epochMS := strconv.FormatFloat(float64(time.Now().UnixNano()/int64(time.Microsecond))/float64(1000000), 'f', 6, 64) | |||
| values, err := redis.Strings(luaPop.Do(conn, epochMS, qType)) | |||
| if err != nil { | |||
| logrus.Error(err) | |||
| slog.Error("error poping from queue", "error", err) | |||
rowanseymour
approved these changes
Oct 6, 2023
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.