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

update a few more log event property names

Browse source
This commit is contained in:
Kenneth Jenkins 2025-04-22 10:16:17 -07:00
parent 4842e696cf
commit a80936361e
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/config_source.go
View file

@ -163,7 +163,7 @@ func NewFileOrEnvironmentSource(
func (src *FileOrEnvironmentSource) check(ctx context.Context) { func (src *FileOrEnvironmentSource) check(ctx context.Context) {
ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context { ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context {
return c.Str("config_change_id", uuid.New().String()) return c.Str("config-change-id", uuid.New().String())
}) })
src.mu.Lock() src.mu.Lock()
cfg := src.config cfg := src.config

2
databroker/cache.go
View file

@ -106,7 +106,7 @@ func New(ctx context.Context, cfg *config.Config, eventsMgr *events.Manager, opt
} }
ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context { ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context {
return c.Str("service", "databroker").Str("config_source", "bootstrap") return c.Str("service", "databroker").Str("config-source", "bootstrap")
}) })
localGRPCConnection, err := grpc.DialContext( localGRPCConnection, err := grpc.DialContext(
ctx, ctx,

4
internal/autocert/manager.go
View file

@ -219,10 +219,10 @@ func (mgr *Manager) renewConfigCerts(ctx context.Context) error {
ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context { ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context {
if len(renew) > 0 { if len(renew) > 0 {
c = c.Strs("renew_domains", renew) c = c.Strs("renew-domains", renew)
} }
if len(ocsp) > 0 { if len(ocsp) > 0 {
c = c.Strs("ocsp_refresh", ocsp) c = c.Strs("ocsp-refresh", ocsp)
} }
return c return c
}) })

2
internal/controlplane/server.go
View file

@ -98,7 +98,7 @@ func NewServer(
} }
ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context { ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context {
return c.Str("server_name", cfg.Options.Services) return c.Str("server-name", cfg.Options.Services)
}) })
var err error var err error

6
internal/zero/reconciler/sync.go
View file

@ -178,7 +178,7 @@ func (c *service) syncUpdatedBundle(ctx context.Context, key string, cached *Bun
log.Ctx(ctx).Debug(). log.Ctx(ctx).Debug().
Str("bundle", key). Str("bundle", key).
Strs("record_types", bundleRecordTypes). Strs("record-types", bundleRecordTypes).
Str("etag", current.ETag). Str("etag", current.ETag).
Str("last-modified", current.LastModified). Str("last-modified", current.LastModified).
Interface("metadata", result.Metadata). Interface("metadata", result.Metadata).
@ -213,9 +213,9 @@ func (c *service) getUpdatedMetadata(ctx context.Context, key string, cached Bun
log.Ctx(ctx).Debug(). log.Ctx(ctx).Debug().
Str("bundle", key). Str("bundle", key).
Strs("record_types", current.RecordTypes). Strs("record-types", current.RecordTypes).
Str("etag", current.ETag). Str("etag", current.ETag).
Str("last_modified", current.LastModified). Str("last-modified", current.LastModified).
Interface("metadata", result.Metadata). Interface("metadata", result.Metadata).
Msg("metadata updated") Msg("metadata updated")

2
pkg/grpc/databroker/leaser.go
View file

@ -95,7 +95,7 @@ func (locker *Leaser) runOnce(ctx context.Context, resetBackoff func()) error {
if status.Code(err) == codes.AlreadyExists { if status.Code(err) == codes.AlreadyExists {
return nil return nil
} else if err != nil { } else if err != nil {
log.Ctx(ctx).Error().Err(err).Str("lease_name", locker.leaseName).Msg("leaser: error acquiring lease") log.Ctx(ctx).Error().Err(err).Str("lease-name", locker.leaseName).Msg("leaser: error acquiring lease")
return retryableError{err} return retryableError{err}
} }
resetBackoff() resetBackoff()

6
pkg/storage/inmemory/backend.go
View file

@ -222,9 +222,9 @@ func (backend *Backend) Put(ctx context.Context, records []*databroker.Record) (
} }
ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context { ctx = log.WithContext(ctx, func(c zerolog.Context) zerolog.Context {
return c.Str("db_op", "put"). return c.Str("db-op", "put").
Str("db_id", record.Id). Str("db-id", record.Id).
Str("db_type", record.Type) Str("db-type", record.Type)
}) })
backend.update(record) backend.update(record)