mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-06 03:32:36 +00:00
0f6380b474
# Which Problems Are Solved
Comparing the v3 and v4 deployments we noticed an increase in memory
usage. A first analysis revealed that it might be related to the
(multiple) initialization of the `i18n.Translator`, partially related
# How the Problems Are Solved
Initialize the tranlator once (apart from the translator interceptor,
which uses context / request specific information) and pass it to all
necessary middleware.
# Additional Changes
Removed unnecessary error return parameter from the translator
initialization.
# Additional Context
- noticed internally
- backport to v4.x
(cherry picked from commit a0c3ccecf7)
81 lines
2.4 KiB
Go
81 lines
2.4 KiB
Go
package i18n
|
|
|
|
import (
|
|
"encoding/json"
|
|
"io"
|
|
"io/fs"
|
|
"net/http"
|
|
"path/filepath"
|
|
"strings"
|
|
|
|
"github.com/BurntSushi/toml"
|
|
"github.com/nicksnyder/go-i18n/v2/i18n"
|
|
"github.com/zitadel/logging"
|
|
"golang.org/x/text/language"
|
|
"sigs.k8s.io/yaml"
|
|
|
|
"github.com/zitadel/zitadel/internal/domain"
|
|
)
|
|
|
|
const i18nPath = "/i18n"
|
|
|
|
var translationMessages = map[Namespace]map[language.Tag]*i18n.MessageFile{
|
|
ZITADEL: make(map[language.Tag]*i18n.MessageFile),
|
|
LOGIN: make(map[language.Tag]*i18n.MessageFile),
|
|
NOTIFICATION: make(map[language.Tag]*i18n.MessageFile),
|
|
}
|
|
|
|
func init() {
|
|
for ns := range translationMessages {
|
|
loadTranslationsFromNamespace(ns)
|
|
}
|
|
}
|
|
|
|
func newBundle(ns Namespace, defaultLanguage language.Tag, allowedLanguages []language.Tag) *i18n.Bundle {
|
|
bundle := i18n.NewBundle(defaultLanguage)
|
|
|
|
for lang, file := range translationMessages[ns] {
|
|
if err := domain.LanguageIsAllowed(false, allowedLanguages, lang); err != nil {
|
|
continue
|
|
}
|
|
bundle.MustAddMessages(lang, file.Messages...)
|
|
}
|
|
|
|
return bundle
|
|
}
|
|
|
|
func loadTranslationsFromNamespace(ns Namespace) {
|
|
dir := LoadFilesystem(ns)
|
|
i18nDir, err := dir.Open(i18nPath)
|
|
logging.WithFields("namespace", ns).OnError(err).Panic("unable to open translation files")
|
|
defer i18nDir.Close()
|
|
files, err := i18nDir.Readdir(0)
|
|
logging.WithFields("namespace", ns).OnError(err).Panic("unable to read translation files")
|
|
for _, file := range files {
|
|
loadTranslationsFromFile(ns, file, dir)
|
|
}
|
|
}
|
|
|
|
func loadTranslationsFromFile(ns Namespace, fileInfo fs.FileInfo, dir http.FileSystem) {
|
|
file, err := dir.Open("/i18n/" + fileInfo.Name())
|
|
logging.WithFields("namespace", ns, "file", fileInfo.Name()).OnError(err).Panic("unable to open translation file")
|
|
defer file.Close()
|
|
|
|
content, err := io.ReadAll(file)
|
|
logging.WithFields("namespace", ns, "file", fileInfo.Name()).OnError(err).Panic("unable to read translation file")
|
|
|
|
unmarshaler := map[string]i18n.UnmarshalFunc{
|
|
"yaml": func(data []byte, v interface{}) error { return yaml.Unmarshal(data, v) },
|
|
"json": json.Unmarshal,
|
|
"toml": toml.Unmarshal,
|
|
}
|
|
|
|
messageFile, err := i18n.ParseMessageFileBytes(content, fileInfo.Name(), unmarshaler)
|
|
logging.WithFields("namespace", ns, "file", fileInfo.Name()).OnError(err).Panic("unable to parse translation file")
|
|
|
|
fileLang, _ := strings.CutSuffix(fileInfo.Name(), filepath.Ext(fileInfo.Name()))
|
|
lang := language.Make(fileLang)
|
|
|
|
translationMessages[ns][lang] = messageFile
|
|
}
|