Arsharth/dex
1
0
Fork 0
forked from mystiq/dex
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove structured logging from the logger interface

Browse source
This commit is contained in:
Mark Sagi-Kazar 2019-02-22 21:26:30 +01:00
parent be581fa7ff
commit d1c8f8d095
No known key found for this signature in database
GPG key ID: 34CC109EB5ED1C2A
3 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/log/logger.go
View file

@ -6,8 +6,6 @@ package log
// Logger serves as an adapter interface for logger libraries // Logger serves as an adapter interface for logger libraries
// so that dex does not depend on any of them directly. // so that dex does not depend on any of them directly.
type Logger interface { type Logger interface {
WithField(key string, value interface{}) Logger
Info(msg string) Info(msg string)
Warn(msg string) Warn(msg string)

5
pkg/log/logrus.go
View file

@ -14,11 +14,6 @@ func NewLogrusLogger(logger logrus.FieldLogger) *LogrusLogger {
} }
} }
// WithField adds a field to the log entry.
func (l *LogrusLogger) WithField(key string, value interface{}) Logger {
return NewLogrusLogger(l.logger.WithField(key, value))
}
// Info logs an Info level event. // Info logs an Info level event.
func (l *LogrusLogger) Info(msg string) { func (l *LogrusLogger) Info(msg string) {
l.logger.Info(msg) l.logger.Info(msg)

2
server/server.go
View file

@ -485,7 +485,7 @@ func (s *Server) OpenConnector(conn storage.Connector) (Connector, error) {
c = newPasswordDB(s.storage) c = newPasswordDB(s.storage)
} else { } else {
var err error var err error
c, err = openConnector(s.logger.WithField("connector", conn.Name), conn) c, err = openConnector(s.logger, conn)
if err != nil { if err != nil {
return Connector{}, fmt.Errorf("failed to open connector: %v", err) return Connector{}, fmt.Errorf("failed to open connector: %v", err)
} }