3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-01 11:26:29 +02:00
Code Issues Projects Releases Packages Wiki Activity

pkg/storage/redis: metrics updates (#1195)

Browse source 
* pkg/storage/redis: add metric to subscribe

* pkg/storage/redis: fix pool stats nil pointer
This commit is contained in:
Travis Groth 2020-08-05 07:16:53 -04:00 • committed by GitHub
parent f538b29a0c
commit 3f9a5f8c32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkg/storage/redis/redis.go
View file

@ -50,7 +50,6 @@ func New(rawURL, recordType string, deletePermanentAfter int64, opts ...Option)
lastVersionKey: recordType + "_last_version", lastVersionKey: recordType + "_last_version",
} }
metrics.AddRedisMetrics(db.pool.Stats)
for _, o := range opts { for _, o := range opts {
o(db) o(db)
} }
@ -74,7 +73,7 @@ func New(rawURL, recordType string, deletePermanentAfter int64, opts ...Option)
return nil return nil
}, },
} }
metrics.AddRedisMetrics(db.pool.Stats)
return db, nil return db, nil
} }
@ -250,6 +249,7 @@ func (db *DB) doNotifyLoop(ctx context.Context, ch chan struct{}, psc *redis.Pub
switch v := psc.Receive().(type) { switch v := psc.Receive().(type) {
case redis.Message: case redis.Message:
log.Debug().Str("action", string(v.Data)).Msg("got redis message") log.Debug().Str("action", string(v.Data)).Msg("got redis message")
recordOperation(ctx, time.Now(), "sub_received", nil)
if string(v.Data) != watchAction { if string(v.Data) != watchAction {
continue continue
} }
@ -261,6 +261,7 @@ func (db *DB) doNotifyLoop(ctx context.Context, ch chan struct{}, psc *redis.Pub
} }
case error: case error:
log.Warn().Err(v).Msg("failed to receive from redis channel") log.Warn().Err(v).Msg("failed to receive from redis channel")
recordOperation(ctx, time.Now(), "sub_received", v)
if _, ok := v.(net.Error); ok { if _, ok := v.(net.Error); ok {
return return
} }