This commit is contained in:
1 parent
064455d09d
commit
85cce0044e
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,
|
||||
|
||||
Reference in new issue
Block a user