From 7d1a042915b71f45e6c4387dd6bad3815b2789da Mon Sep 17 00:00:00 2001 From: rmanach Date: Mon, 6 Jan 2025 10:58:05 +0100 Subject: [PATCH] do not call sync once just after init --- services/environments.go | 4 ++-- templates/templates.go | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/services/environments.go b/services/environments.go index 6f3223b..639f6bd 100644 --- a/services/environments.go +++ b/services/environments.go @@ -15,7 +15,7 @@ const ( defaultMainDir = "./store" ) -var env = sync.OnceValue[environment](newEnv)() +var env = sync.OnceValue[environment](newEnv) type environment struct { adminUsername string @@ -77,5 +77,5 @@ func newEnv() environment { } func GetEnv() environment { - return env + return env() } diff --git a/templates/templates.go b/templates/templates.go index 6469b6e..4816557 100644 --- a/templates/templates.go +++ b/templates/templates.go @@ -65,7 +65,7 @@ var homeTmpl = sync.OnceValue[*template.Template](func() *template.Template { } return baseTmpl -})() +}) var uploadFormTmpl = sync.OnceValue[*template.Template](func() *template.Template { baseTmpl, err := template.New("base").Parse(base) @@ -78,7 +78,7 @@ var uploadFormTmpl = sync.OnceValue[*template.Template](func() *template.Templat } return baseTmpl -})() +}) var loginFormTmpl = sync.OnceValue[*template.Template](func() *template.Template { baseTmpl, err := template.New("base").Parse(base) @@ -91,7 +91,7 @@ var loginFormTmpl = sync.OnceValue[*template.Template](func() *template.Template } return baseTmpl -})() +}) var loginSuccessTmpl = sync.OnceValue[*template.Template](func() *template.Template { baseTmpl, err := template.New("base").Parse(base) @@ -104,20 +104,20 @@ var loginSuccessTmpl = sync.OnceValue[*template.Template](func() *template.Templ } return baseTmpl -})() +}) func GetHome() *template.Template { - return homeTmpl + return homeTmpl() } func GetLoginForm() *template.Template { - return loginFormTmpl + return loginFormTmpl() } func GetLoginSuccess() *template.Template { - return loginSuccessTmpl + return loginSuccessTmpl() } func GetUploadForm() *template.Template { - return uploadFormTmpl + return uploadFormTmpl() }