Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions internal/dictionary/dictionary.go
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,6 @@ func (d *Dictionary) Lemma(lemma string, entryNo int) (Lemma, error) {
}

if entryNo > 0 {
if entryNo > len(lemmaData.Entries) {
return Lemma{}, ErrEntryNotFound
}

entryIndexes, ok := index.entryNoMap[entryNo]
if !ok {
return Lemma{}, ErrEntryNotFound
Expand Down
7 changes: 6 additions & 1 deletion internal/http/httphandler/handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,12 @@ func sendResponse[resT any](ctx *ginCtx, res *resT, err error, opts ...handlerOp
statusCodeMessage := http.StatusText(statusCode)

if err != nil {
logger.FromContext(ctx).ErrorContext(ctx, "HTTP error occurred", logger.Error(err), slog.Int("code", statusCode))
l := logger.FromContext(ctx)
logFn := l.ErrorContext
if statusCode >= 400 && statusCode < 500 {
logFn = l.WarnContext
}
logFn(ctx, "HTTP error occurred", logger.Error(err), slog.Int("code", statusCode))

innerErrMsg := statusCodeMessage

Expand Down
7 changes: 7 additions & 0 deletions internal/logger/config.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package logger

import "log/slog"

type Config struct {
Level slog.Level `env:"LOG_LEVEL,default=INFO"`
}
2 changes: 2 additions & 0 deletions internal/logger/loggerfx/logger.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ import (
contexts "github.com/raf555/kbbi-api/internal/context"
"github.com/raf555/kbbi-api/internal/context/contextfx"
"github.com/raf555/kbbi-api/internal/logger"
salomeconfig "github.com/raf555/salome/config/v1"
"go.uber.org/fx"
)

var Provider = fx.Module(
"logger",
fx.Provide(salomeconfig.LoadConfigTo[logger.Config], fx.Private),
fx.Provide(logger.New),
contextfx.Provider(func(log *slog.Logger) contexts.ContextDecoratorFn {
return func(ctx context.Context) context.Context {
Expand Down
4 changes: 2 additions & 2 deletions internal/logger/slog.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
slogformatter "github.com/samber/slog-formatter"
)

func New() *slog.Logger {
func New(cfg Config) *slog.Logger {
var handler slog.Handler

handler = slog.NewJSONHandler(os.Stdout, nil)
handler = slog.NewJSONHandler(os.Stdout, &slog.HandlerOptions{Level: cfg.Level})
handler = log.WithOtelHandler(handler)
handler = log.WithFormatter(handler, slogformatter.FormatByKind(slog.KindDuration, func(v slog.Value) slog.Value {
return slog.StringValue(v.Duration().String())
Expand Down
Loading