Skip to content

Commit e00e993

Browse files
author
Dean Karn
authored
rename console logger builder + function (#43)
1 parent b53ceba commit e00e993

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

benchmarks/benchmark_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ var _jane = user{
3030
// annoying because you have to manipulate the TestMain before
3131
// running the benchmark you want.
3232
func TestMain(m *testing.M) {
33-
cLog := log.NewBuilder().WithGoSTDErrLogs(false).WithWriter(ioutil.Discard).Build()
33+
cLog := log.NewConsoleBuilder().WithGoSTDErrLogs(false).WithWriter(ioutil.Discard).Build()
3434
log.AddHandler(cLog, log.AllLevels...)
3535
os.Exit(m.Run())
3636
}

default_logger.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -18,38 +18,38 @@ const (
1818
v = "%v"
1919
)
2020

21-
// Builder is used to create a new console logger
22-
type Builder struct {
21+
// ConsoleBuilder is used to create a new console logger
22+
type ConsoleBuilder struct {
2323
writer io.Writer
2424
timestampFormat string
2525
redirect bool
2626
}
2727

28-
// NewBuilder creates a new Builder for configuring and creating a new console logger
29-
func NewBuilder() *Builder {
30-
return &Builder{
28+
// NewConsoleBuilder creates a new ConsoleBuilder for configuring and creating a new console logger
29+
func NewConsoleBuilder() *ConsoleBuilder {
30+
return &ConsoleBuilder{
3131
writer: os.Stderr,
3232
timestampFormat: DefaultTimeFormat,
3333
redirect: true,
3434
}
3535
}
3636

37-
func (b *Builder) WithGoSTDErrLogs(redirect bool) *Builder {
37+
func (b *ConsoleBuilder) WithGoSTDErrLogs(redirect bool) *ConsoleBuilder {
3838
b.redirect = redirect
3939
return b
4040
}
4141

42-
func (b *Builder) WithWriter(writer io.Writer) *Builder {
42+
func (b *ConsoleBuilder) WithWriter(writer io.Writer) *ConsoleBuilder {
4343
b.writer = writer
4444
return b
4545
}
4646

47-
func (b *Builder) WithTimestampFormat(format string) *Builder {
47+
func (b *ConsoleBuilder) WithTimestampFormat(format string) *ConsoleBuilder {
4848
b.timestampFormat = format
4949
return b
5050
}
5151

52-
func (b *Builder) Build() *Logger {
52+
func (b *ConsoleBuilder) Build() *Logger {
5353
c := &Logger{
5454
writer: b.writer,
5555
timestampFormat: b.timestampFormat,

default_logger_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestConsoleLogger(t *testing.T) {
2525

2626
SetExitFunc(func(int) {})
2727

28-
cLog := NewBuilder().WithWriter(buff).WithTimestampFormat("").Build()
28+
cLog := NewConsoleBuilder().WithWriter(buff).WithTimestampFormat("").Build()
2929
AddHandler(cLog, AllLevels...)
3030
defer func() { _ = cLog.Close() }()
3131
for i, tt := range tests {
@@ -90,7 +90,7 @@ func TestConsoleLogger(t *testing.T) {
9090

9191
func TestConsoleSTDLogCapturing(t *testing.T) {
9292
buff := new(buffer)
93-
cLog := NewBuilder().WithWriter(buff).WithTimestampFormat("MST").Build()
93+
cLog := NewConsoleBuilder().WithWriter(buff).WithTimestampFormat("MST").Build()
9494
AddHandler(cLog, AllLevels...)
9595

9696
stdlog.Println("STD LOG message")

log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ var (
2222

2323
func init() {
2424
if term.IsTerminal(int(os.Stdin.Fd())) {
25-
h := NewBuilder().Build()
25+
h := NewConsoleBuilder().Build()
2626
AddHandler(h, AllLevels...)
2727
defaultHandler = h
2828
}

0 commit comments

Comments
 (0)