Skip to content

Commit f22d3bc

Browse files
committed
Change name of NewDefaultEmitter and NewStreamEmitter
1 parent 2704675 commit f22d3bc

File tree

9 files changed

+28
-33
lines changed

9 files changed

+28
-33
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# v0.4.1 (Jan 6, 2023)
2+
3+
- Change name of NewStreamEmitter to NewBufferEmitter.
4+
- Change name of NewDefaultEmitter to NewStreamEmitter.
5+
- Remove default logger of xybor.
6+
17
# v0.4.0 (Jan 6, 2023)
28

39
- Allow determine the buffer size in emitter.

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ var handler = xylog.GetHandler("handler")
9898
`StreamEmitter` is supported. You can use any `Writer` in this `Emitter` type.
9999

100100
```golang
101-
var emitter = xylog.NewDefaultEmitter(os.Stdout)
101+
var emitter = xylog.NewStreamEmitter(os.Stdout)
102102
```
103103

104104
When a logging method is called, the `Logger` creates a `LogRecord` and sends it
@@ -293,7 +293,7 @@ in different application zones.
293293
```golang
294294
// common/setup.go
295295
func init() {
296-
var emitter = xylog.NewDefaultEmitter(os.Stderr)
296+
var emitter = xylog.NewStreamEmitter(os.Stderr)
297297
var handler = xylog.GetHandler("")
298298
handler.AddEmitter(emitter)
299299
handler.SetEncoding(encoding.NewJSONEncoding())

config.go

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -34,17 +34,6 @@ import (
3434
func init() {
3535
rootLogger = newLogger("", nil)
3636
rootLogger.SetLevel(WARNING)
37-
38-
var handler = GetHandler("xybor")
39-
handler.AddEmitter(NewDefaultEmitter(os.Stderr))
40-
handler.SetEncoding(encoding.NewTextEncoding())
41-
handler.AddMacro("time", "asctime")
42-
handler.AddMacro("level", "levelname")
43-
handler.AddMacro("module", "name")
44-
45-
var logger = GetLogger("xybor")
46-
logger.SetLevel(WARNING)
47-
logger.AddHandler(handler)
4837
}
4938

5039
// Default levels, these can be replaced with any positive set of values having
@@ -230,7 +219,7 @@ func (cfg SimpleConfig) Apply() (*Logger, error) {
230219
}
231220
}
232221

233-
var emitter = NewDefaultEmitter(writer)
222+
var emitter = NewStreamEmitter(writer)
234223

235224
var enc = cfg.Encoding
236225
if enc == nil {

emitter.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,8 @@ type StreamEmitter struct {
4646
lock *xylock.Lock
4747
}
4848

49-
// NewStreamEmitter creates a StreamEmitter which writes message to a LogWriter
50-
// (os.Stderr by default).
51-
func NewStreamEmitter(w io.Writer, bufsize int) *StreamEmitter {
49+
// NewBufferEmitter creates a StreamEmitter which uses a Buffered Writer.
50+
func NewBufferEmitter(w io.Writer, bufsize int) *StreamEmitter {
5251
xycond.AssertNotNil(w)
5352

5453
if bufsize != 0 {
@@ -66,9 +65,10 @@ func NewStreamEmitter(w io.Writer, bufsize int) *StreamEmitter {
6665
return e
6766
}
6867

69-
// NewDefaultEmitter creates a StreamEmitter not using the buffer size.
70-
func NewDefaultEmitter(w io.Writer) *StreamEmitter {
71-
return NewStreamEmitter(w, 0)
68+
// NewStreamEmitter creates a StreamEmitter which writes logging message to a
69+
// stream.
70+
func NewStreamEmitter(w io.Writer) *StreamEmitter {
71+
return NewBufferEmitter(w, 0)
7272
}
7373

7474
// Emit will be called after a record was decided to log.

emitter_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131

3232
func TestNewStreamEmitterWithNil(t *testing.T) {
3333
xycond.ExpectPanic(xyerror.AssertionError, func() {
34-
xylog.NewDefaultEmitter(nil)
34+
xylog.NewStreamEmitter(nil)
3535
}).Test(t)
3636
}
3737

example_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func ExampleSimpleConfig() {
5252
}
5353

5454
func ExampleLogger() {
55-
var emitter = xylog.NewDefaultEmitter(os.Stdout)
55+
var emitter = xylog.NewStreamEmitter(os.Stdout)
5656
var handler = xylog.GetHandler("")
5757
handler.AddEmitter(emitter)
5858

@@ -93,7 +93,7 @@ func ExampleHandler() {
9393
}
9494

9595
func ExampleEventLogger() {
96-
var emitter = xylog.NewDefaultEmitter(os.Stdout)
96+
var emitter = xylog.NewStreamEmitter(os.Stdout)
9797
var handler = xylog.GetHandler("")
9898
handler.AddEmitter(emitter)
9999

@@ -109,7 +109,7 @@ func ExampleEventLogger() {
109109
}
110110

111111
func ExampleNewJSONEncoding() {
112-
var emitter = xylog.NewDefaultEmitter(os.Stdout)
112+
var emitter = xylog.NewStreamEmitter(os.Stdout)
113113
var handler = xylog.GetHandler("")
114114
handler.AddEmitter(emitter)
115115
handler.SetEncoding(encoding.NewJSONEncoding())
@@ -127,7 +127,7 @@ func ExampleNewJSONEncoding() {
127127
}
128128

129129
func ExampleNewTextEncoding() {
130-
var emitter = xylog.NewDefaultEmitter(os.Stdout)
130+
var emitter = xylog.NewStreamEmitter(os.Stdout)
131131
var handler = xylog.GetHandler("")
132132
handler.AddEmitter(emitter)
133133
handler.SetEncoding(encoding.NewTextEncoding())
@@ -145,7 +145,7 @@ func ExampleNewTextEncoding() {
145145
}
146146

147147
func ExampleFilter() {
148-
var emitter = xylog.NewDefaultEmitter(os.Stdout)
148+
var emitter = xylog.NewStreamEmitter(os.Stdout)
149149
var handler = xylog.GetHandler("")
150150
handler.AddEmitter(emitter)
151151
handler.AddFilter(&test.LoggerNameFilter{Name: "example.filter.chat"})

handler_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func TestHandlerFileters(t *testing.T) {
6868
}
6969

7070
func TestHandlerEmitters(t *testing.T) {
71-
var emitter = xylog.NewDefaultEmitter(os.Stdout)
71+
var emitter = xylog.NewStreamEmitter(os.Stdout)
7272
var handler = xylog.GetHandler("")
7373
handler.AddEmitter(emitter)
7474
xycond.ExpectEqual(len(handler.Emitters()), 1).Test(t)
@@ -109,6 +109,6 @@ func TestHandlerFullMacro(t *testing.T) {
109109
xycond.ExpectEqual("asctime=ASCTIME created=1 filename=FILENAME "+
110110
"funcname=FUNCNAME levelname=LEVELNAME levelno=2 lineno=3 "+
111111
"module=MODULE msecs=4 pathname=PATHNAME process=5 "+
112-
"relativeCreated=6", w.Captured).Test(t)
112+
"relativeCreated=6\n", w.Captured).Test(t)
113113
})
114114
}

logger_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func TestLoggerFindCaller(t *testing.T) {
191191

192192
func TestLoggerFlushParent(t *testing.T) {
193193
var writer = &test.MockWriter{}
194-
var emitter = xylog.NewDefaultEmitter(writer)
194+
var emitter = xylog.NewStreamEmitter(writer)
195195
var handler = xylog.GetHandler("")
196196
handler.AddEmitter(emitter)
197197

test/context.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
// WithLogger allows using a Logger created with a MockWriter quickly.
3232
func WithLogger(t *testing.T, f func(logger *xylog.Logger, w *MockWriter)) {
3333
var writer = &MockWriter{}
34-
var emitter = xylog.NewStreamEmitter(writer, 1)
34+
var emitter = xylog.NewStreamEmitter(writer)
3535
var handler = xylog.GetHandler("")
3636
handler.AddEmitter(emitter)
3737

@@ -47,7 +47,7 @@ func WithLogger(t *testing.T, f func(logger *xylog.Logger, w *MockWriter)) {
4747
// WithHandler allows using a Handler with MockWriter.
4848
func WithHandler(t *testing.T, f func(h *xylog.Handler, w *MockWriter)) {
4949
var writer = &MockWriter{}
50-
var emitter = xylog.NewStreamEmitter(writer, 1)
50+
var emitter = xylog.NewStreamEmitter(writer)
5151
var handler = xylog.GetHandler(t.Name())
5252
handler.AddEmitter(emitter)
5353

@@ -58,13 +58,13 @@ func WithHandler(t *testing.T, f func(h *xylog.Handler, w *MockWriter)) {
5858
// quickly.
5959
func WithStreamEmitter(t *testing.T, f func(e *xylog.StreamEmitter, w *MockWriter)) {
6060
var writer = &MockWriter{}
61-
var emitter = xylog.NewStreamEmitter(writer, 1)
61+
var emitter = xylog.NewStreamEmitter(writer)
6262
f(emitter, writer)
6363
}
6464

6565
// WithBenchLogger allows using a Logger whose output is io.Discard.
6666
func WithBenchLogger(b *testing.B, f func(logger *xylog.Logger)) {
67-
var emitter = xylog.NewStreamEmitter(io.Discard, 4096)
67+
var emitter = xylog.NewBufferEmitter(io.Discard, 4096)
6868
var handler = xylog.GetHandler("")
6969
handler.AddEmitter(emitter)
7070
handler.SetEncoding(encoding.NewJSONEncoding())

0 commit comments

Comments
 (0)