Skip to content

Commit 2c65dfa

Browse files
committed
Linting package logger
Signed-off-by: Vincent Demeester <[email protected]>
1 parent aad6728 commit 2c65dfa

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

Diff for: docker/container.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -374,9 +374,9 @@ func (c *Container) Log() error {
374374
}
375375
return scanner.Err()
376376
} else {
377-
_, err := stdcopy.StdCopy(&logger.LoggerWrapper{
377+
_, err := stdcopy.StdCopy(&logger.Wrapper{
378378
Logger: l,
379-
}, &logger.LoggerWrapper{
379+
}, &logger.Wrapper{
380380
Err: true,
381381
Logger: l,
382382
}, output)

Diff for: logger/null.go

+4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
package logger
22

3+
// NullLogger is a logger.Logger and logger.Factory implementation that does nothing.
34
type NullLogger struct {
45
}
56

7+
// Out is a no-op function.
68
func (n *NullLogger) Out(_ []byte) {
79
}
810

11+
// Err is a no-op function.
912
func (n *NullLogger) Err(_ []byte) {
1013
}
1114

15+
// Create implements logger.Factory and returns a NullLogger.
1216
func (n *NullLogger) Create(_ string) Logger {
1317
return &NullLogger{}
1418
}

Diff for: logger/types.go

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
package logger
22

3+
// Factory defines methods a factory should implement, to create a Logger
4+
// based on the specified name.
35
type Factory interface {
46
Create(name string) Logger
57
}
68

9+
// Logger defines methods to implement for being a logger.
710
type Logger interface {
811
Out(bytes []byte)
912
Err(bytes []byte)
1013
}
1114

12-
type LoggerWrapper struct {
15+
// Wrapper is a wrapper around Logger that implements the Writer interface,
16+
// mainly use by docker/pkg/stdcopy functions.
17+
type Wrapper struct {
1318
Err bool
1419
Logger Logger
1520
}
1621

17-
func (l *LoggerWrapper) Write(bytes []byte) (int, error) {
22+
func (l *Wrapper) Write(bytes []byte) (int, error) {
1823
if l.Err {
1924
l.Logger.Err(bytes)
2025
} else {

Diff for: script/validate-lint

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ packages=(
1212
cli/logger
1313
cli/main
1414
lookup
15+
logger
1516
version
1617
utils
1718
)

0 commit comments

Comments
 (0)