ca1e1dce36
The upload/koji package functions were creating a logger and then were using it. This is not ideal for a library implementation. Signed-off-by: Tomáš Hozza <thozza@redhat.com>
50 lines
1.2 KiB
Go
50 lines
1.2 KiB
Go
package main
|
|
|
|
import (
|
|
"strings"
|
|
|
|
rh "github.com/hashicorp/go-retryablehttp"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
type LeveledLogrus struct {
|
|
*logrus.Logger
|
|
}
|
|
|
|
func NewRHLeveledLogger(logger *logrus.Logger) rh.LeveledLogger {
|
|
if logger == nil {
|
|
logger = logrus.StandardLogger()
|
|
}
|
|
return rh.LeveledLogger(&LeveledLogrus{logger})
|
|
}
|
|
|
|
const monitoringKeyword = "retrying"
|
|
|
|
func fields(keysAndValues ...interface{}) map[string]interface{} {
|
|
fields := make(map[string]interface{})
|
|
|
|
for i := 0; i < len(keysAndValues)-1; i += 2 {
|
|
fields[keysAndValues[i].(string)] = keysAndValues[i+1]
|
|
}
|
|
|
|
return fields
|
|
}
|
|
|
|
func (l *LeveledLogrus) Error(msg string, keysAndValues ...interface{}) {
|
|
l.WithFields(fields(keysAndValues...)).Error(msg)
|
|
}
|
|
|
|
func (l *LeveledLogrus) Info(msg string, keysAndValues ...interface{}) {
|
|
l.WithFields(fields(keysAndValues...)).Info(msg)
|
|
}
|
|
func (l *LeveledLogrus) Debug(msg string, keysAndValues ...interface{}) {
|
|
if strings.Contains(msg, monitoringKeyword) {
|
|
l.WithFields(fields(keysAndValues...)).Info(msg)
|
|
} else {
|
|
l.WithFields(fields(keysAndValues...)).Debug(msg)
|
|
}
|
|
}
|
|
|
|
func (l *LeveledLogrus) Warn(msg string, keysAndValues ...interface{}) {
|
|
l.WithFields(fields(keysAndValues...)).Warn(msg)
|
|
}
|