diff --git a/pkg/infra/tracer/http_tracer.go b/pkg/infra/tracer/http_tracer.go index 0dcc23c..d8af713 100644 --- a/pkg/infra/tracer/http_tracer.go +++ b/pkg/infra/tracer/http_tracer.go @@ -188,7 +188,6 @@ func initLogger(ctx context.Context, conn *grpc.ClientConn) (func(context.Contex lp := otelLog.NewLoggerProvider( otelLog.WithProcessor(otelLog.NewBatchProcessor(logExporter)), ) - global.SetLoggerProvider(lp) logger := otelslog.NewLogger(serviceName.Value.AsString()) diff --git a/pkg/ui/http/templater/templater.go b/pkg/ui/http/templater/templater.go index fd9f147..474dd04 100644 --- a/pkg/ui/http/templater/templater.go +++ b/pkg/ui/http/templater/templater.go @@ -37,10 +37,7 @@ func (t *TemplateHTML) Render(name string, view interface{}, response http.Respo return nil, fmt.Errorf("error parsing templates: %v", err) } - if err = htmlTemplate.ExecuteTemplate(response, name, view); err != nil { - return nil, fmt.Errorf("error executing template: %v", err) - } - return nil, nil + return nil, htmlTemplate.ExecuteTemplate(response, name, view) } // parseTemplates parses templates diff --git a/pkg/ui/http/templater/templater_test.go b/pkg/ui/http/templater/templater_test.go index 6fe1e32..99e3604 100644 --- a/pkg/ui/http/templater/templater_test.go +++ b/pkg/ui/http/templater/templater_test.go @@ -1,18 +1,23 @@ package templater_test import ( - "github.com/Medzoner/medzoner-go/pkg/ui/http/templater" - "gotest.tools/assert" + "github.com/Medzoner/medzoner-go/pkg/infra/config" "net/http/httptest" "os" "testing" + + "github.com/Medzoner/medzoner-go/pkg/ui/http/templater" + + "gotest.tools/assert" ) func TestRender(t *testing.T) { + rootPath := "../../../../" t.Run("Unit: test Render success", func(t *testing.T) { - var tpl = templater.TemplateHTML{ - RootPath: "../../../../", + cfg := config.Config{ + RootPath: config.RootPath(rootPath), } + var tpl = templater.NewTemplateHTML(cfg) _, err := tpl.Render( "index", nil,