cmd/dex: add logging config and serve logger for different modules.
This commit is contained in:
@@ -6,17 +6,19 @@ import (
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/coreos/dex/storage"
|
||||
)
|
||||
|
||||
// New returns an in memory storage.
|
||||
func New() storage.Storage {
|
||||
func New(logger logrus.FieldLogger) storage.Storage {
|
||||
return &memStorage{
|
||||
clients: make(map[string]storage.Client),
|
||||
authCodes: make(map[string]storage.AuthCode),
|
||||
refreshTokens: make(map[string]storage.RefreshToken),
|
||||
authReqs: make(map[string]storage.AuthRequest),
|
||||
passwords: make(map[string]storage.Password),
|
||||
logger: logger,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,8 +30,8 @@ type Config struct {
|
||||
}
|
||||
|
||||
// Open always returns a new in memory storage.
|
||||
func (c *Config) Open() (storage.Storage, error) {
|
||||
return New(), nil
|
||||
func (c *Config) Open(logger logrus.FieldLogger) (storage.Storage, error) {
|
||||
return New(logger), nil
|
||||
}
|
||||
|
||||
type memStorage struct {
|
||||
@@ -42,6 +44,8 @@ type memStorage struct {
|
||||
passwords map[string]storage.Password
|
||||
|
||||
keys storage.Keys
|
||||
|
||||
logger logrus.FieldLogger
|
||||
}
|
||||
|
||||
func (s *memStorage) tx(f func()) {
|
||||
|
@@ -1,11 +1,23 @@
|
||||
package memory
|
||||
|
||||
import (
|
||||
"os"
|
||||
"testing"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/coreos/dex/storage"
|
||||
"github.com/coreos/dex/storage/conformance"
|
||||
)
|
||||
|
||||
func TestStorage(t *testing.T) {
|
||||
conformance.RunTests(t, New)
|
||||
logger := &logrus.Logger{
|
||||
Out: os.Stderr,
|
||||
Formatter: &logrus.TextFormatter{DisableColors: true},
|
||||
Level: logrus.DebugLevel,
|
||||
}
|
||||
|
||||
newStorage := func() storage.Storage {
|
||||
return New(logger)
|
||||
}
|
||||
conformance.RunTests(t, newStorage)
|
||||
}
|
||||
|
@@ -1,14 +1,21 @@
|
||||
package memory
|
||||
|
||||
import (
|
||||
"os"
|
||||
"reflect"
|
||||
"testing"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/coreos/dex/storage"
|
||||
)
|
||||
|
||||
func TestStaticClients(t *testing.T) {
|
||||
s := New()
|
||||
logger := &logrus.Logger{
|
||||
Out: os.Stderr,
|
||||
Formatter: &logrus.TextFormatter{DisableColors: true},
|
||||
Level: logrus.DebugLevel,
|
||||
}
|
||||
s := New(logger)
|
||||
|
||||
c1 := storage.Client{ID: "foo", Secret: "foo_secret"}
|
||||
c2 := storage.Client{ID: "bar", Secret: "bar_secret"}
|
||||
|
Reference in New Issue
Block a user