Skip to content
This repository was archived by the owner on Sep 2, 2024. It is now read-only.

Commit 49ad3a1

Browse files
committed
feat: integrate logger into ui layerj
1 parent 9814080 commit 49ad3a1

File tree

2 files changed

+70
-68
lines changed

2 files changed

+70
-68
lines changed

render.go

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package staticbackend
33
import (
44
"fmt"
55
"html/template"
6-
"log"
76
"net/http"
87
"os"
98
"path/filepath"
10-
"runtime/debug"
119
"strconv"
1210
"strings"
1311
"time"
12+
13+
"github.com/staticbackendhq/core/logger"
1414
)
1515

1616
var (
@@ -69,11 +69,11 @@ type ViewData struct {
6969
Data interface{}
7070
}
7171

72-
func render(w http.ResponseWriter, r *http.Request, view string, data interface{}, flash *Flash) {
73-
renderWithMenu(w, r, view, data, flash, "")
72+
func render(w http.ResponseWriter, r *http.Request, view string, data interface{}, flash *Flash, log *logger.Logger) {
73+
renderWithMenu(w, r, view, data, flash, "", log)
7474
}
7575

76-
func renderWithMenu(w http.ResponseWriter, r *http.Request, view string, data interface{}, flash *Flash, menu string) {
76+
func renderWithMenu(w http.ResponseWriter, r *http.Request, view string, data interface{}, flash *Flash, menu string, log *logger.Logger) {
7777
vd := ViewData{
7878
ActiveMenu: menu,
7979
Data: data,
@@ -87,19 +87,18 @@ func renderWithMenu(w http.ResponseWriter, r *http.Request, view string, data in
8787
}
8888

8989
if err := tmpl.Execute(w, vd); err != nil {
90-
//TODO: log this, it's important
91-
log.Printf(`error executing template "%s" got %v`, view, err)
90+
log.Error().Err(err).Msgf(`error executing template "%s"`, view)
91+
9292
http.Error(w, err.Error(), http.StatusInternalServerError)
9393
}
9494
}
9595

96-
func renderErr(w http.ResponseWriter, r *http.Request, err error) {
96+
func renderErr(w http.ResponseWriter, r *http.Request, err error, log *logger.Logger) {
9797
if err != nil {
98-
//TODO: log this
99-
log.Println("err in ui", err)
100-
debug.PrintStack()
98+
log.Error().Err(err).Stack().Msg("err in ui")
10199
}
102-
render(w, r, "err.html", nil, nil)
100+
101+
render(w, r, "err.html", nil, nil, log)
103102
}
104103

105104
func customFuncs() template.FuncMap {

0 commit comments

Comments
 (0)