diff --git a/benchmarks/benchmark_test.go b/benchmarks/benchmark_test.go index 60883f0..25f5483 100644 --- a/benchmarks/benchmark_test.go +++ b/benchmarks/benchmark_test.go @@ -30,7 +30,7 @@ var _jane = user{ // annoying because you have to manipulate the TestMain before // running the benchmark you want. func TestMain(m *testing.M) { - cLog := log.NewBuilder().WithGoSTDErrLogs(false).WithWriter(ioutil.Discard).Build() + cLog := log.NewConsoleBuilder().WithGoSTDErrLogs(false).WithWriter(ioutil.Discard).Build() log.AddHandler(cLog, log.AllLevels...) os.Exit(m.Run()) } diff --git a/default_logger.go b/default_logger.go index 160899a..de78486 100644 --- a/default_logger.go +++ b/default_logger.go @@ -18,38 +18,38 @@ const ( v = "%v" ) -// Builder is used to create a new console logger -type Builder struct { +// ConsoleBuilder is used to create a new console logger +type ConsoleBuilder struct { writer io.Writer timestampFormat string redirect bool } -// NewBuilder creates a new Builder for configuring and creating a new console logger -func NewBuilder() *Builder { - return &Builder{ +// NewConsoleBuilder creates a new ConsoleBuilder for configuring and creating a new console logger +func NewConsoleBuilder() *ConsoleBuilder { + return &ConsoleBuilder{ writer: os.Stderr, timestampFormat: DefaultTimeFormat, redirect: true, } } -func (b *Builder) WithGoSTDErrLogs(redirect bool) *Builder { +func (b *ConsoleBuilder) WithGoSTDErrLogs(redirect bool) *ConsoleBuilder { b.redirect = redirect return b } -func (b *Builder) WithWriter(writer io.Writer) *Builder { +func (b *ConsoleBuilder) WithWriter(writer io.Writer) *ConsoleBuilder { b.writer = writer return b } -func (b *Builder) WithTimestampFormat(format string) *Builder { +func (b *ConsoleBuilder) WithTimestampFormat(format string) *ConsoleBuilder { b.timestampFormat = format return b } -func (b *Builder) Build() *Logger { +func (b *ConsoleBuilder) Build() *Logger { c := &Logger{ writer: b.writer, timestampFormat: b.timestampFormat, diff --git a/default_logger_test.go b/default_logger_test.go index cb066bb..6e45bca 100644 --- a/default_logger_test.go +++ b/default_logger_test.go @@ -25,7 +25,7 @@ func TestConsoleLogger(t *testing.T) { SetExitFunc(func(int) {}) - cLog := NewBuilder().WithWriter(buff).WithTimestampFormat("").Build() + cLog := NewConsoleBuilder().WithWriter(buff).WithTimestampFormat("").Build() AddHandler(cLog, AllLevels...) defer func() { _ = cLog.Close() }() for i, tt := range tests { @@ -90,7 +90,7 @@ func TestConsoleLogger(t *testing.T) { func TestConsoleSTDLogCapturing(t *testing.T) { buff := new(buffer) - cLog := NewBuilder().WithWriter(buff).WithTimestampFormat("MST").Build() + cLog := NewConsoleBuilder().WithWriter(buff).WithTimestampFormat("MST").Build() AddHandler(cLog, AllLevels...) stdlog.Println("STD LOG message") diff --git a/log.go b/log.go index 20621e1..aabb442 100644 --- a/log.go +++ b/log.go @@ -22,7 +22,7 @@ var ( func init() { if term.IsTerminal(int(os.Stdin.Fd())) { - h := NewBuilder().Build() + h := NewConsoleBuilder().Build() AddHandler(h, AllLevels...) defaultHandler = h }