Skip to content

Commit c71df3c

Browse files
committed
sloglint settings
1 parent 248924c commit c71df3c

File tree

5 files changed

+17
-8
lines changed

5 files changed

+17
-8
lines changed

.golangci.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,3 +118,12 @@ linters-settings:
118118
simple: true
119119
range-loops: true
120120
for-loops: true
121+
122+
sloglint:
123+
attr-only: true
124+
no-global: "all"
125+
context: "scope" # report only if a context exists in the scope of the outermost function
126+
static-msg: true
127+
key-naming-case: snake # Values: snake, kebab, camel, pascal
128+
forbidden-keys:
129+
- msg

internal/config/config.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ func Load(ctx context.Context, envVarPrefix string, defaultConfigs map[string]an
2222

2323
// Load default values.
2424
if err := k.Load(confmap.Provider(defaultConfigs, delim), nil); err != nil {
25-
logger.Debug("error during config loading from defaults", logx.Error(err))
25+
logger.DebugContext(ctx, "error during config loading from defaults", logx.Error(err))
2626
}
2727

2828
// Load YAML config.
2929
if err := k.Load(file.Provider("config.yaml"), yaml.Parser()); err != nil {
30-
logger.Debug("error during config loading from yaml file", logx.Error(err))
30+
logger.DebugContext(ctx, "error during config loading from yaml file", logx.Error(err))
3131
if !errors.Is(err, fs.ErrNotExist) {
3232
return k, err
3333
}
@@ -39,12 +39,12 @@ func Load(ctx context.Context, envVarPrefix string, defaultConfigs map[string]an
3939
"log": map[string]any{},
4040
}
4141
if err := k.Load(env.Provider(envVarPrefix, delim, buildEnvVarsNamesMapper(envVarsLevels, envVarPrefix)), nil); err != nil {
42-
logger.Warn("error during config loading from env vars", logx.Error(err))
42+
logger.WarnContext(ctx, "error during config loading from env vars", logx.Error(err))
4343
}
4444

4545
// Load .env file
4646
if err := k.Load(file.Provider(".env"), dotenv.ParserEnv(envVarPrefix, delim, buildEnvVarsNamesMapper(envVarsLevels, envVarPrefix))); err != nil {
47-
logger.Warn("error during config loading from dot env file", logx.Error(err))
47+
logger.WarnContext(ctx, "error during config loading from dot env file", logx.Error(err))
4848
if !errors.Is(err, fs.ErrNotExist) {
4949
return k, err
5050
}

internal/daemon.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func (o *Daemon) OnShutDown(f ...func(context.Context)) {
3737
}
3838

3939
func (o *Daemon) shutDown(ctx context.Context) {
40-
o.logger.Info("starting graceful shutdown")
40+
o.logger.InfoContext(ctx, "starting graceful shutdown")
4141
deadline := time.Now().Add(o.config.shutdownTimeout)
4242
dlCtx, dlCancel := context.WithDeadline(ctx, deadline)
4343
o.onShutDownMutex.Lock()

internal/httpx/inbound.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ func RespondJSON(ctx context.Context, w http.ResponseWriter, statusCode int, bod
4848
if body != nil {
4949
if err := json.NewEncoder(w).Encode(body); err != nil {
5050
logger := logx.GetFromContext(ctx)
51-
logger.Error("error during response encoding", logx.Error(err))
51+
logger.ErrorContext(ctx, "error during response encoding", logx.Error(err))
5252
}
5353
}
5454
}

internal/httpx/router.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,9 @@ func LogRoutes(ctx context.Context, r *chi.Mux) {
7878
}
7979

8080
if err := chi.Walk(r, walkFunc); err != nil {
81-
logger.Error("error during chi walk", logx.Error(err))
81+
logger.ErrorContext(ctx, "error during chi walk", logx.Error(err))
8282
} else {
83-
logger.Debug("http routes", slog.Any("routes", routes))
83+
logger.DebugContext(ctx, "http routes", slog.Any("routes", routes))
8484
}
8585
}
8686

0 commit comments

Comments
 (0)