3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-06-01 10:22:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

core/logging: change log.Error function (#5251)

Browse source 
* core/logging: change log.Error function

* use request id
This commit is contained in:
Caleb Doxsey 2024-09-05 15:42:46 -06:00 • committed by GitHub
parent 97bf5edc54
commit dad954ae16
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
66 changed files with 163 additions and 166 deletions
Download patch file Download diff file Expand all files Collapse all files

20
config/options.go
View file

@ -413,10 +413,10 @@ func checkConfigKeysErrors(configFile string, o *Options, unused []string) error
var evt *zerolog.Event
switch check.KeyAction {
case KeyActionError:
evt = log.Error(ctx)
evt = log.Ctx(ctx).Error()
err = errInvalidConfigKeys
default:
evt = log.Error(ctx)
evt = log.Ctx(ctx).Error()
}
evt.Str("config_file", configFile).Str("key", check.Key)
if check.DocsURL != "" {
@ -428,7 +428,7 @@ func checkConfigKeysErrors(configFile string, o *Options, unused []string) error
// check for unknown runtime flags
for flag := range o.RuntimeFlags {
if _, ok := defaultRuntimeFlags[flag]; !ok {
log.Error(ctx).Str("config_file", configFile).Str("flag", string(flag)).Msg("unknown runtime flag")
log.Ctx(ctx).Error().Str("config_file", configFile).Str("flag", string(flag)).Msg("unknown runtime flag")
}
}
@ -825,7 +825,7 @@ func (o *Options) UseStatelessAuthenticateFlow() bool {
} else if flow == "stateful" {
return false
}
log.Error(context.Background()).
log.Error().
Msgf("ignoring unknown DEBUG_FORCE_AUTHENTICATE_FLOW setting %q", flow)
}
u, err := o.GetInternalAuthenticateURL()
@ -1147,13 +1147,13 @@ func (o *Options) GetX509Certificates() []*x509.Certificate {
if o.CertFile != "" {
cert, err := cryptutil.ParsePEMCertificateFromFile(o.CertFile)
if err != nil {
log.Error(context.Background()).Err(err).Str("file", o.CertFile).Msg("invalid cert_file")
log.Error().Err(err).Str("file", o.CertFile).Msg("invalid cert_file")
} else {
certs = append(certs, cert)
}
} else if o.Cert != "" {
if cert, err := cryptutil.ParsePEMCertificateFromBase64(o.Cert); err != nil {
log.Error(context.Background()).Err(err).Msg("invalid cert")
log.Error().Err(err).Msg("invalid cert")
} else {
certs = append(certs, cert)
}
@ -1162,7 +1162,7 @@ func (o *Options) GetX509Certificates() []*x509.Certificate {
for _, c := range o.CertificateData {
cert, err := cryptutil.ParsePEMCertificate(c.GetCertBytes())
if err != nil {
log.Error(context.Background()).Err(err).Msg("invalid certificate")
log.Error().Err(err).Msg("invalid certificate")
} else {
certs = append(certs, cert)
}
@ -1171,7 +1171,7 @@ func (o *Options) GetX509Certificates() []*x509.Certificate {
for _, c := range o.CertificateFiles {
cert, err := cryptutil.ParsePEMCertificateFromFile(c.CertFile)
if err != nil {
log.Error(context.Background()).Err(err).Msg("invalid certificate_file")
log.Error().Err(err).Msg("invalid certificate_file")
} else {
certs = append(certs, cert)
}
@ -1481,12 +1481,12 @@ func (o *Options) applyExternalCerts(ctx context.Context, certsIndex *cryptutil.
for _, c := range certs {
cert, err := cryptutil.ParsePEMCertificate(c.GetCertBytes())
if err != nil {
log.Error(ctx).Err(err).Msg("parsing cert from databroker: skipped")
log.Ctx(ctx).Error().Err(err).Msg("parsing cert from databroker: skipped")
continue
}
if overlaps, name := certsIndex.OverlapsWithExistingCertificate(cert); overlaps {
log.Error(ctx).Err(err).Str("domain", name).Msg("overlaps with local certs: skipped")
log.Ctx(ctx).Error().Err(err).Str("domain", name).Msg("overlaps with local certs: skipped")
continue
}