From f902581a4a0eea8bbe3bbfc987c8919489c9e2db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pedro=20P=C3=A9rez?= Date: Thu, 22 Aug 2024 20:44:17 +0200 Subject: [PATCH] =?UTF-8?q?refactor:=20:recycle:=20uso=20de=20slog=20y=20p?= =?UTF-8?q?aso=20de=20funciones=20p=C3=BAblica=20a=20privadas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- render.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/render.go b/render.go index 6bd394c..f452270 100644 --- a/render.go +++ b/render.go @@ -6,7 +6,6 @@ import ( "fmt" "html/template" "io/fs" - "log" "log/slog" "net/http" "path/filepath" @@ -78,10 +77,10 @@ func New(opts ...OptionFunc) *Render { Functions: functions, } - return config.Apply(opts...) + return config.apply(opts...) } -func (re *Render) Apply(opts ...OptionFunc) *Render { +func (re *Render) apply(opts ...OptionFunc) *Render { for _, opt := range opts { opt(re) } @@ -89,7 +88,7 @@ func (re *Render) Apply(opts ...OptionFunc) *Render { return re } -func AddDefaultData(td *TemplateData, r *http.Request) *TemplateData { +func addDefaultData(td *TemplateData, r *http.Request) *TemplateData { td.CSRFToken = nosurf.Token(r) return td } @@ -103,7 +102,7 @@ func (re *Render) Template(w http.ResponseWriter, r *http.Request, tmpl string, } else { tc, err = re.createTemplateCache() if err != nil { - log.Println("error creating template cache:", err) + slog.Error("error creating template cache:", "error", err) return err } } @@ -114,16 +113,16 @@ func (re *Render) Template(w http.ResponseWriter, r *http.Request, tmpl string, } buf := new(bytes.Buffer) - td = AddDefaultData(td, r) + td = addDefaultData(td, r) err = t.Execute(buf, td) if err != nil { - log.Println("error executing template:", err) + slog.Error("error executing template:", "error", err) return err } _, err = buf.WriteTo(w) if err != nil { - log.Println("error writing template to browser:", err) + slog.Error("error writing template to browser:", "error", err) } return nil @@ -150,7 +149,7 @@ func (re *Render) createTemplateCache() (TemplateCache, error) { return nil }) - for function, _ := range re.Functions { + for function := range re.Functions { slog.Info("function found", "function", function) }