mirror of
https://github.com/zitadel/zitadel.git
synced 2025-12-06 02:22:16 +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)
41 lines
1.3 KiB
Go
41 lines
1.3 KiB
Go
package handlers
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/zitadel/logging"
|
|
|
|
"github.com/zitadel/zitadel/internal/api/authz"
|
|
"github.com/zitadel/zitadel/internal/i18n"
|
|
)
|
|
|
|
func (n *NotificationQueries) GetTranslatorWithOrgTexts(ctx context.Context, orgID, textType string) (*i18n.Translator, error) {
|
|
restrictions, err := n.Queries.GetInstanceRestrictions(ctx)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
translator := i18n.NewNotificationTranslator(n.GetDefaultLanguage(ctx), restrictions.AllowedLanguages)
|
|
|
|
allCustomTexts, err := n.CustomTextListByTemplate(ctx, authz.GetInstance(ctx).InstanceID(), textType, false)
|
|
if err != nil {
|
|
return translator, nil
|
|
}
|
|
customTexts, err := n.CustomTextListByTemplate(ctx, orgID, textType, false)
|
|
if err != nil {
|
|
return translator, nil
|
|
}
|
|
allCustomTexts.CustomTexts = append(allCustomTexts.CustomTexts, customTexts.CustomTexts...)
|
|
|
|
for _, text := range allCustomTexts.CustomTexts {
|
|
msg := i18n.Message{
|
|
ID: text.Template + "." + text.Key,
|
|
Text: text.Text,
|
|
}
|
|
err = translator.AddMessages(text.Language, msg)
|
|
logging.WithFields("instanceID", authz.GetInstance(ctx).InstanceID(), "orgID", orgID, "messageType", textType, "messageID", msg.ID).
|
|
OnError(err).
|
|
Warn("could not add translation message")
|
|
}
|
|
return translator, nil
|
|
}
|