优化:清理运行日志调用栈绝对路径,并修复SMTP中继配置保存校验
This commit is contained in:
1 parent
b3a71ce32a
commit
8071752ffc
6 files changed
+46
-5
No files matched your search
@@ -155,7 +155,7 @@ func (l *logFormatter) Format(entry *log.Entry) ([]byte, error) {
|
||||
}
|
||||
}
|
||||
if entry.Caller != nil {
|
||||
b.WriteString(fmt.Sprintf("[%s:%d]", entry.Caller.File, entry.Caller.Line))
|
||||
b.WriteString(fmt.Sprintf("[%s:%d]", runtimepath.CleanCallerPath(entry.Caller.File), entry.Caller.Line))
|
||||
}
|
||||
b.WriteString(entry.Message)
|
||||
// 错误字段也是有效内容,不能在消息为空时被格式器丢弃。
|
||||
|
||||
@@ -883,6 +883,13 @@ func applySectionPayload(current RuntimeConfig, section Section, payload json.Ra
|
||||
return RuntimeConfig{}, ErrInvalidSecretChange
|
||||
}
|
||||
value.SMTPSectionConfig.Relay.Password = current.SMTP.Relay.Password
|
||||
if smtpRelayConfigured(value.SMTPSectionConfig.Relay) && value.SMTPSectionConfig.Relay.Security == "" {
|
||||
if ResolveMailSecurity(value.SMTPSectionConfig.Listener) == MailSecurityImplicitTLS {
|
||||
value.SMTPSectionConfig.Relay.Security = MailSecurityImplicitTLS
|
||||
} else {
|
||||
value.SMTPSectionConfig.Relay.Security = MailSecuritySTARTTLS
|
||||
}
|
||||
}
|
||||
candidate.SMTP = value.SMTPSectionConfig
|
||||
candidate.Email.Policy.LoginVerificationPolicy = candidate.SMTP.Relay.LoginPolicy
|
||||
case SectionEmail:
|
||||
@@ -904,6 +911,13 @@ func applySectionPayload(current RuntimeConfig, section Section, payload json.Ra
|
||||
return RuntimeConfig{}, ErrInvalidSecretChange
|
||||
}
|
||||
value.MailSectionConfig.Relay.Password = current.SMTP.Relay.Password
|
||||
if smtpRelayConfigured(value.Relay) && value.Relay.Security == "" {
|
||||
if ResolveMailSecurity(value.Listener) == MailSecurityImplicitTLS {
|
||||
value.Relay.Security = MailSecurityImplicitTLS
|
||||
} else {
|
||||
value.Relay.Security = MailSecuritySTARTTLS
|
||||
}
|
||||
}
|
||||
candidate.SMTP = SMTPSectionConfig{
|
||||
Meta: value.Meta,
|
||||
Listener: value.Listener,
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package framework
|
||||
|
||||
import (
|
||||
"git.pcux.cn/xuans/Smail/utils/runtimepath"
|
||||
"bytes"
|
||||
"crypto/subtle"
|
||||
"encoding/json"
|
||||
@@ -141,7 +142,7 @@ func (l *logFormatter) Format(entry *log.Entry) ([]byte, error) {
|
||||
b.WriteString(fmt.Sprintf("[%s]", ctx.GetValue(context.LogID)))
|
||||
}
|
||||
}
|
||||
b.WriteString(fmt.Sprintf("[%s:%d]", entry.Caller.File, entry.Caller.Line))
|
||||
b.WriteString(fmt.Sprintf("[%s:%d]", runtimepath.CleanCallerPath(entry.Caller.File), entry.Caller.Line))
|
||||
b.WriteString(entry.Message)
|
||||
|
||||
b.WriteString("\n")
|
||||
|
||||
@@ -270,3 +270,26 @@ func migrate(root string, rename func(string, string) error) ([]Move, error) {
|
||||
}
|
||||
return completed, nil
|
||||
}
|
||||
|
||||
// CleanCallerPath 清洗调用者代码路径,去除本地盘符和宿主机绝对目录,只保留模块相对路径。
|
||||
func CleanCallerPath(path string) string {
|
||||
if strings.TrimSpace(path) == "" {
|
||||
return ""
|
||||
}
|
||||
normalized := strings.ReplaceAll(path, string(filepath.Separator), "/")
|
||||
normalized = strings.ReplaceAll(normalized, "\\", "/")
|
||||
for _, target := range []string{"backend/", "frontend/", "plugins/"} {
|
||||
if index := strings.Index(normalized, target); index != -1 {
|
||||
return normalized[index:]
|
||||
}
|
||||
}
|
||||
marker := "smail/"
|
||||
lower := strings.ToLower(normalized)
|
||||
if index := strings.Index(lower, marker); index != -1 {
|
||||
return normalized[index+len(marker):]
|
||||
}
|
||||
if len(normalized) >= 2 && normalized[1] == ':' {
|
||||
return strings.TrimLeft(normalized[2:], "/")
|
||||
}
|
||||
return normalized
|
||||
}
|
||||
Reference in new issue
Block a user