Skip to content

Chore: improvements for Notifier #8

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 2 commits into
base: master
Choose a base branch
from
Open

Chore: improvements for Notifier #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0d23ac
minor improvements in notifier
piyushdatazip Feb 23, 2023
544cc48
Merge branch 'master' into fix/delete-password
piyushdatazip Feb 23, 2023
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 middleware.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func ExceptionHandlerMiddleware(next http.Handler) http.Handler {
body, err := io.ReadAll(r.Body)
if err != nil {
logrus.Error(err)
NotifyError("Exception Handler Middleware Error", "failed to read request body", err.Error(), "URI", r.RequestURI)
NotifyError("Exception Handler Middleware Error", "failed to read request body", err.Error())
w.WriteHeader(http.StatusTeapot)
return
}
Expand All @@ -57,7 +57,7 @@ func ExceptionHandlerMiddleware(next http.Handler) http.Handler {
// print stack trace as well
fmt.Println(stackTrace)
w.WriteHeader(http.StatusInternalServerError)
NotifyError("Exception Handler Middleware Recovery", "Check stack trace above", fmt.Sprintf("%v\n%s", err, stackTrace), "Request", string(body), "URI", r.RequestURI)
NotifyError("Exception Handler Middleware Recovery", "Check stack trace above", fmt.Sprintf("%v\n%s", err, stackTrace), "Request", string(body))
}
}()

Expand All @@ -66,29 +66,29 @@ func ExceptionHandlerMiddleware(next http.Handler) http.Handler {
cloneRequest.Body = io.NopCloser(bytes.NewReader(body))
next.ServeHTTP(rw, cloneRequest)

description := fmt.Sprintf("failed request with StatusCode: %d", rw.statusCode)
description := fmt.Sprintf("failed request with status code[%d] : url[%s] : origin[%s]", rw.statusCode, r.RequestURI, r.RemoteAddr)

body = func() []byte {
var request map[string]interface{}
if err := json.Unmarshal(body, &request); err != nil {
NotifyWarn("Exception Handler Middleware Recovery", "failed to un-marshal request body", fmt.Sprintf("%v : %v", request, err), "URI", r.RequestURI)
NotifyWarn("Exception Handler Middleware Recovery", "failed to un-marshal request body", fmt.Sprintf("%v : %v", request, err))
return body
}

request = deleteFields(request)
modifiedBody, err := json.Marshal(request)
if err != nil {
NotifyWarn("Exception Handler Middleware Recovery", "failed to marshal request body", fmt.Sprintf("%v : %v", request, err), "URI", r.RequestURI)
NotifyWarn("Exception Handler Middleware Recovery", "failed to marshal request body", fmt.Sprintf("%v : %v", request, err))
return body
}

return modifiedBody
}()

if rw.statusCode >= 500 {
NotifyError("Exception Handler Middleware Error", description, "", "url", r.RequestURI, "Response", string(rw.response), "Request", string(body), "URI", r.RequestURI)
NotifyError("Exception Handler Middleware Error", description, "", "Response", string(rw.response), "Request", string(body))
} else if rw.statusCode >= 400 {
NotifyWarn("Exception Handler Middleware Warn", description, fmt.Sprintf("Response: %s", string(rw.response)), "URI", r.RequestURI)
NotifyWarn("Exception Handler Middleware Error", description, "", "Response", string(rw.response), "Request", string(body))
}

logrus.Debug("Exception Handler Middleware Passed!!!")
Expand Down