Skip to content

Use logr.Logger instead of LogSink #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Use logr.Logger instead of LogSink #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions response.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,19 @@ type ResponseWriter interface {

type response struct {
http.ResponseWriter
req Request
r *render.Render
log logr.Logger
req Request
r *render.Render
logger logr.Logger
}

var _ ResponseWriter = &response{}

func NewResponseWriter(w http.ResponseWriter, req *http.Request, r *render.Render, sink logr.LogSink) ResponseWriter {
func NewResponseWriter(w http.ResponseWriter, req *http.Request, r *render.Render, logger logr.Logger) ResponseWriter {
return &response{
ResponseWriter: w,
req: &request{req: req},
r: r,
log: logr.New(sink),
logger: logger,
}
}

Expand Down Expand Up @@ -149,9 +149,9 @@ func (w *response) Error(status int, contents ...interface{}) {
v = fmt.Sprintf("%v", obj)
}

if len(title) > 0 && w.log.GetSink() != nil {
if len(title) > 0 && w.logger.GetSink() != nil {
// log the error with the title
w.log.Error(fmt.Errorf(v), title)
w.logger.Error(fmt.Errorf(v), title)
}

http.Error(w, v, status)
Expand Down
4 changes: 2 additions & 2 deletions status.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ func (w *response) APIError(err error) int {
return code
}

if w.log.GetSink() != nil {
w.log.Error(err, string(status.Reason))
if w.logger.GetSink() != nil {
w.logger.Error(err, string(status.Reason))
}
w.JSON(code, status)
return code
Expand Down