Chore: Remove dead code (#28664)

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>

pkg/infra/log/log.go

@@ -36,13 +36,6 @@ func New(logger string, ctx ...interface{}) Logger {
 	return Root.New(params...)
 }
 
-// NewWithLevel returns a new logger with a certain level.
-func NewWithLevel(name string, level log15.Lvl) Logger {
-	logger := Root.New("logger", name)
-	logger.SetHandler(log15.LvlFilterHandler(level, log15.StreamHandler(os.Stdout, getLogFormat("console"))))
-	return logger
-}
-
 func Tracef(format string, v ...interface{}) {
 	var message string
 	if len(v) > 0 {
@@ -91,10 +84,6 @@ func Errorf(skip int, format string, v ...interface{}) {
 	Root.Error(fmt.Sprintf(format, v...))
 }
 
-func Criticalf(skip int, format string, v ...interface{}) {
-	Root.Crit(fmt.Sprintf(format, v...))
-}
-
 func Fatalf(skip int, format string, v ...interface{}) {
 	Root.Crit(fmt.Sprintf(format, v...))
 	Close()
@@ -114,25 +103,6 @@ func Reload() {
 	}
 }
 
-func GetLogLevelFor(name string) Lvl {
-	if level, ok := filters[name]; ok {
-		switch level {
-		case log15.LvlWarn:
-			return LvlWarn
-		case log15.LvlInfo:
-			return LvlInfo
-		case log15.LvlError:
-			return LvlError
-		case log15.LvlCrit:
-			return LvlCrit
-		default:
-			return LvlDebug
-		}
-	}
-
-	return LvlInfo
-}
-
 var logLevels = map[string]log15.Lvl{
 	"trace":    log15.LvlDebug,
 	"debug":    log15.LvlDebug,

pkg/infra/log/log_writer.go

@@ -1,39 +0,0 @@
-package log
-
-import (
-	"io"
-	"strings"
-)
-
-type logWriterImpl struct {
-	log    Logger
-	level  Lvl
-	prefix string
-}
-
-func NewLogWriter(log Logger, level Lvl, prefix string) io.Writer {
-	return &logWriterImpl{
-		log:    log,
-		level:  level,
-		prefix: prefix,
-	}
-}
-
-func (l *logWriterImpl) Write(p []byte) (n int, err error) {
-	message := l.prefix + strings.TrimSpace(string(p))
-
-	switch l.level {
-	case LvlCrit:
-		l.log.Crit(message)
-	case LvlError:
-		l.log.Error(message)
-	case LvlWarn:
-		l.log.Warn(message)
-	case LvlInfo:
-		l.log.Info(message)
-	default:
-		l.log.Debug(message)
-	}
-
-	return len(p), nil
-}

pkg/infra/log/log_writer_test.go

@@ -1,122 +0,0 @@
-package log
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/inconshreveable/log15"
-)
-
-type FakeLogger struct {
-	m map[string]string
-}
-
-func (f *FakeLogger) New(ctx ...interface{}) log15.Logger {
-	return nil
-}
-
-func (f *FakeLogger) Debug(msg string, ctx ...interface{}) {
-	f.m["debug"] = msg
-}
-
-func (f *FakeLogger) Info(msg string, ctx ...interface{}) {
-	f.m["info"] = msg
-}
-
-func (f *FakeLogger) Warn(msg string, ctx ...interface{}) {
-	f.m["warn"] = msg
-}
-
-func (f *FakeLogger) Error(msg string, ctx ...interface{}) {
-	f.m["err"] = msg
-}
-
-func (f *FakeLogger) Crit(msg string, ctx ...interface{}) {
-	f.m["crit"] = msg
-}
-
-func (f *FakeLogger) GetHandler() log15.Handler {
-	return nil
-}
-
-func (f *FakeLogger) SetHandler(l log15.Handler) {}
-
-func TestLogWriter_level(t *testing.T) {
-	tests := []struct {
-		description      string
-		logger           string
-		prefix           string
-		level            Lvl
-		input            []byte
-		expectedConsumed int
-		expectedOutput   string
-	}{
-		{
-			description:      "level crit",
-			logger:           "crit",
-			input:            []byte("crit"),
-			level:            LvlCrit,
-			expectedConsumed: 4,
-			expectedOutput:   "crit",
-		},
-		{
-			description:      "level error",
-			logger:           "err",
-			input:            []byte("error"),
-			level:            LvlError,
-			expectedConsumed: 5,
-			expectedOutput:   "error",
-		},
-		{
-			description:      "level warn",
-			logger:           "warn",
-			input:            []byte("warn"),
-			level:            LvlWarn,
-			expectedConsumed: 4,
-			expectedOutput:   "warn",
-		},
-		{
-			description:      "level info",
-			logger:           "info",
-			input:            []byte("info"),
-			level:            LvlInfo,
-			expectedConsumed: 4,
-			expectedOutput:   "info",
-		},
-		{
-			description:      "level debug",
-			logger:           "debug",
-			input:            []byte("debug"),
-			level:            LvlDebug,
-			expectedConsumed: 5,
-			expectedOutput:   "debug",
-		},
-		{
-			description:      "prefix",
-			logger:           "debug",
-			input:            []byte("debug"),
-			prefix:           "prefix",
-			level:            LvlDebug,
-			expectedConsumed: 5,
-			expectedOutput:   "prefixdebug",
-		},
-	}
-
-	for _, tc := range tests {
-		tc := tc // to avoid timing issues
-
-		t.Run(tc.description, func(t *testing.T) {
-			t.Parallel()
-			fake := &FakeLogger{m: map[string]string{}}
-
-			w := NewLogWriter(fake, tc.level, tc.prefix)
-			n, err := w.Write(tc.input)
-			require.NoError(t, err)
-
-			assert.Equal(t, tc.expectedConsumed, n)
-			assert.Equal(t, tc.expectedOutput, fake.m[tc.logger])
-		})
-	}
-}