@@ -3,14 +3,14 @@ package staticbackend
3
3
import (
4
4
"fmt"
5
5
"html/template"
6
- "log"
7
6
"net/http"
8
7
"os"
9
8
"path/filepath"
10
- "runtime/debug"
11
9
"strconv"
12
10
"strings"
13
11
"time"
12
+
13
+ "github.com/staticbackendhq/core/logger"
14
14
)
15
15
16
16
var (
@@ -69,11 +69,11 @@ type ViewData struct {
69
69
Data interface {}
70
70
}
71
71
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 )
74
74
}
75
75
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 ) {
77
77
vd := ViewData {
78
78
ActiveMenu : menu ,
79
79
Data : data ,
@@ -87,19 +87,18 @@ func renderWithMenu(w http.ResponseWriter, r *http.Request, view string, data in
87
87
}
88
88
89
89
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
+
92
92
http .Error (w , err .Error (), http .StatusInternalServerError )
93
93
}
94
94
}
95
95
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 ) {
97
97
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" )
101
99
}
102
- render (w , r , "err.html" , nil , nil )
100
+
101
+ render (w , r , "err.html" , nil , nil , log )
103
102
}
104
103
105
104
func customFuncs () template.FuncMap {
0 commit comments