@@ -12,16 +12,15 @@ import (
1212 "time"
1313)
1414
15- // mockFailingHandler is a handler that always returns an error from its Handle method.
15+ // mockFailingHandler is a handler that always returns an error
16+ // from its Handle method.
1617type mockFailingHandler struct {
1718 Handler
1819 err error
1920}
2021
2122func (h * mockFailingHandler ) Handle (ctx context.Context , r Record ) error {
22- // It still calls the underlying handler's Handle method to ensure the log can be processed.
2323 _ = h .Handler .Handle (ctx , r )
24- // But it always returns a predefined error.
2524 return h .err
2625}
2726
@@ -94,23 +93,21 @@ func TestMultiHandler(t *testing.T) {
9493 })
9594
9695 t .Run ("Handle propagates errors from handlers" , func (t * testing.T ) {
97- var buf bytes.Buffer
98- h1 := NewTextHandler (& buf , nil )
96+ errFail := errors .New ("mock failing" )
9997
100- errFail := errors .New ("fake fail" )
101- h2 := & mockFailingHandler {
102- Handler : NewTextHandler (& bytes.Buffer {}, nil ),
103- err : errFail ,
104- }
98+ var buf1 , buf2 bytes.Buffer
99+ h1 := NewTextHandler (& buf1 , nil )
100+ h2 := & mockFailingHandler {Handler : NewJSONHandler (& buf2 , nil ), err : errFail }
105101
106- multi := MultiHandler (h1 , h2 )
102+ multi := MultiHandler (h2 , h1 )
107103
108104 err := multi .Handle (context .Background (), NewRecord (time .Now (), LevelInfo , "test message" , 0 ))
109105 if ! errors .Is (err , errFail ) {
110106 t .Errorf ("Expected error: %v, but got: %v" , errFail , err )
111107 }
112108
113- checkLogOutput (t , buf .String (), "time=" + textTimeRE + ` level=INFO msg="test message"` )
109+ checkLogOutput (t , buf1 .String (), "time=" + textTimeRE + ` level=INFO msg="test message"` )
110+ checkLogOutput (t , buf2 .String (), `{"time":"` + jsonTimeRE + `","level":"INFO","msg":"test message"}` )
114111 })
115112
116113 t .Run ("Handle with no handlers" , func (t * testing.T ) {
0 commit comments