Skip to content

Commit b54e7e4

Browse files
committed
Removed Logger.Name method (use type-assertions instead)
1 parent 2dd20bf commit b54e7e4

File tree

3 files changed

+13
-33
lines changed

3 files changed

+13
-33
lines changed

Diff for: legacy/builder/i18n/errors.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
)
99

1010
func ErrorfWithLogger(logger Logger, format string, a ...interface{}) error {
11-
if logger.Name() == "machine" {
11+
if _, isMachineLogger := logger.(*MachineLogger); isMachineLogger {
1212
logger.Fprintln(os.Stderr, constants.LOG_LEVEL_ERROR, format, a...)
1313
return errors.New("")
1414
}

Diff for: legacy/builder/i18n/i18n.go

+8-29
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ var PLACEHOLDER = regexp.MustCompile(`{(\d)}`)
3131
type Logger interface {
3232
Fprintln(w io.Writer, level string, format string, a ...interface{})
3333
Println(level string, format string, a ...interface{})
34-
Name() string
3534
}
3635

3736
type LoggerToCustomStreams struct {
@@ -54,63 +53,43 @@ func (s *LoggerToCustomStreams) Println(level string, format string, a ...interf
5453
s.Fprintln(nil, level, format, a...)
5554
}
5655

57-
func (s *LoggerToCustomStreams) Name() string {
58-
return "LoggerToCustomStreams"
59-
}
60-
6156
type NoopLogger struct{}
6257

63-
func (s NoopLogger) Fprintln(w io.Writer, level string, format string, a ...interface{}) {}
58+
func (s *NoopLogger) Fprintln(w io.Writer, level string, format string, a ...interface{}) {}
6459

65-
func (s NoopLogger) Println(level string, format string, a ...interface{}) {}
66-
67-
func (s NoopLogger) Name() string {
68-
return "noop"
69-
}
60+
func (s *NoopLogger) Println(level string, format string, a ...interface{}) {}
7061

7162
type HumanTagsLogger struct{}
7263

73-
func (s HumanTagsLogger) Fprintln(w io.Writer, level string, format string, a ...interface{}) {
64+
func (s *HumanTagsLogger) Fprintln(w io.Writer, level string, format string, a ...interface{}) {
7465
format = "[" + level + "] " + format
7566
fprintln(w, Format(format, a...))
7667
}
7768

78-
func (s HumanTagsLogger) Println(level string, format string, a ...interface{}) {
69+
func (s *HumanTagsLogger) Println(level string, format string, a ...interface{}) {
7970
s.Fprintln(os.Stdout, level, format, a...)
8071
}
8172

82-
func (s HumanTagsLogger) Name() string {
83-
return "humantags"
84-
}
85-
8673
type HumanLogger struct{}
8774

88-
func (s HumanLogger) Fprintln(w io.Writer, level string, format string, a ...interface{}) {
75+
func (s *HumanLogger) Fprintln(w io.Writer, level string, format string, a ...interface{}) {
8976
fprintln(w, Format(format, a...))
9077
}
9178

92-
func (s HumanLogger) Println(level string, format string, a ...interface{}) {
79+
func (s *HumanLogger) Println(level string, format string, a ...interface{}) {
9380
s.Fprintln(os.Stdout, level, format, a...)
9481
}
9582

96-
func (s HumanLogger) Name() string {
97-
return "human"
98-
}
99-
10083
type MachineLogger struct{}
10184

102-
func (s MachineLogger) Fprintln(w io.Writer, level string, format string, a ...interface{}) {
85+
func (s *MachineLogger) Fprintln(w io.Writer, level string, format string, a ...interface{}) {
10386
printMachineFormattedLogLine(w, level, format, a)
10487
}
10588

106-
func (s MachineLogger) Println(level string, format string, a ...interface{}) {
89+
func (s *MachineLogger) Println(level string, format string, a ...interface{}) {
10790
printMachineFormattedLogLine(os.Stdout, level, format, a)
10891
}
10992

110-
func (s MachineLogger) Name() string {
111-
return "machine"
112-
}
113-
11493
func printMachineFormattedLogLine(w io.Writer, level string, format string, a []interface{}) {
11594
a = append([]interface{}(nil), a...)
11695
for idx, value := range a {

Diff for: legacy/builder/test/i18n_test.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,11 @@ package test
1717

1818
import (
1919
"fmt"
20+
"testing"
21+
2022
"github.com/arduino/arduino-cli/legacy/builder/constants"
2123
"github.com/arduino/arduino-cli/legacy/builder/i18n"
2224
"github.com/stretchr/testify/require"
23-
"testing"
2425
)
2526

2627
func TestI18NSyntax(t *testing.T) {
@@ -50,9 +51,9 @@ func TestI18NSyntax(t *testing.T) {
5051

5152
func TestI18NInheritance(t *testing.T) {
5253
var logger i18n.Logger
53-
logger = i18n.HumanLogger{}
54+
logger = &i18n.HumanLogger{}
5455
logger.Println(constants.LOG_LEVEL_INFO, "good {0} {1}", "morning", "vietnam!")
5556

56-
logger = i18n.MachineLogger{}
57+
logger = &i18n.MachineLogger{}
5758
logger.Println(constants.LOG_LEVEL_INFO, "good {0} {1}", "morning", "vietnam!")
5859
}

0 commit comments

Comments
 (0)