3pp-mirror/pomerium
1
0
Fork 0
mirror of https://github.com/pomerium/pomerium.git synced 2025-05-30 09:27:19 +02:00
Code Issues Projects Releases Packages Wiki Activity

atomicutil: use atomicutil.Value wherever possible (#3517)

Browse source 
* atomicutil: use atomicutil.Value wherever possible

* fix test

* fix mux router
This commit is contained in:
Caleb Doxsey 2022-07-28 15:38:38 -06:00 • committed by GitHub
parent 5c14d2c994
commit 0ac7e45a21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
23 changed files with 121 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

11
internal/log/log.go
View file

@ -5,16 +5,17 @@ import (
"context"
"net/http"
"os"
"sync/atomic"
"github.com/rs/zerolog"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
"github.com/pomerium/pomerium/internal/atomicutil"
)
var (
logger atomic.Value
zapLogger atomic.Value
logger = atomicutil.NewValue(new(zerolog.Logger))
zapLogger = atomicutil.NewValue(new(zap.Logger))
zapLevel zap.AtomicLevel
)
@ -55,12 +56,12 @@ func SetLogger(l *zerolog.Logger) {
// Logger returns the global logger.
func Logger() *zerolog.Logger {
return logger.Load().(*zerolog.Logger)
return logger.Load()
}
// ZapLogger returns the global zap logger.
func ZapLogger() *zap.Logger {
return zapLogger.Load().(*zap.Logger)
return zapLogger.Load()
}
// SetLevel sets the minimum global log level. Options are 'debug' 'info' 'warn' and 'error'.