mirror of https://github.com/status-im/go-waku.git
fix: logging.From panic (#268)
This commit is contained in:
parent
1d88f03caa
commit
fbdc814b1b
|
@ -8,9 +8,11 @@ import (
|
||||||
|
|
||||||
var logKey = &struct{}{}
|
var logKey = &struct{}{}
|
||||||
|
|
||||||
// From allows retrieving the Logger from a Context
|
// From allows retrieving the Logger from a Context.
|
||||||
|
// Returns nil if Context does not have one.
|
||||||
func From(ctx context.Context) *zap.Logger {
|
func From(ctx context.Context) *zap.Logger {
|
||||||
return ctx.Value(logKey).(*zap.Logger)
|
logger, _ := ctx.Value(logKey).(*zap.Logger)
|
||||||
|
return logger
|
||||||
}
|
}
|
||||||
|
|
||||||
// With associates a Logger with a Context to allow passing
|
// With associates a Logger with a Context to allow passing
|
||||||
|
|
|
@ -0,0 +1,21 @@
|
||||||
|
package logging
|
||||||
|
|
||||||
|
import (
|
||||||
|
"context"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"github.com/stretchr/testify/require"
|
||||||
|
"go.uber.org/zap"
|
||||||
|
)
|
||||||
|
|
||||||
|
func Test_EmptyContext(t *testing.T) {
|
||||||
|
logger := From(context.Background())
|
||||||
|
require.Nil(t, logger)
|
||||||
|
}
|
||||||
|
|
||||||
|
func Test_With(t *testing.T) {
|
||||||
|
logger, err := zap.NewDevelopment()
|
||||||
|
require.NoError(t, err)
|
||||||
|
ctx := With(context.Background(), logger)
|
||||||
|
require.Equal(t, logger, From(ctx))
|
||||||
|
}
|
Loading…
Reference in New Issue