mirror of
https://github.com/cloudflare/cloudflared.git
synced 2025-07-27 21:40:02 +00:00
TUN-7127: Disconnect logger level requirement for management
By default, we want streaming logs to be able to stream debug logs from cloudflared without needing to update the remote cloudflared's configuration. This disconnects the provided local log level sent to console, file, etc. from the level that management tunnel will utilize via requested filters.
This commit is contained in:
@@ -9,14 +9,13 @@ import (
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
var writeCalls int
|
||||
|
||||
type mockedWriter struct {
|
||||
wantErr bool
|
||||
wantErr bool
|
||||
writeCalls int
|
||||
}
|
||||
|
||||
func (c mockedWriter) Write(p []byte) (int, error) {
|
||||
writeCalls++
|
||||
func (c *mockedWriter) Write(p []byte) (int, error) {
|
||||
c.writeCalls++
|
||||
|
||||
if c.wantErr {
|
||||
return -1, errors.New("Expected error")
|
||||
@@ -26,65 +25,108 @@ func (c mockedWriter) Write(p []byte) (int, error) {
|
||||
}
|
||||
|
||||
// Tests that a new writer is only used if it actually works.
|
||||
func TestResilientMultiWriter(t *testing.T) {
|
||||
func TestResilientMultiWriter_Errors(t *testing.T) {
|
||||
tests := []struct {
|
||||
name string
|
||||
writers []io.Writer
|
||||
writers []*mockedWriter
|
||||
}{
|
||||
{
|
||||
name: "All valid writers",
|
||||
writers: []io.Writer{
|
||||
mockedWriter{
|
||||
writers: []*mockedWriter{
|
||||
{
|
||||
wantErr: false,
|
||||
},
|
||||
mockedWriter{
|
||||
{
|
||||
wantErr: false,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "All invalid writers",
|
||||
writers: []io.Writer{
|
||||
mockedWriter{
|
||||
writers: []*mockedWriter{
|
||||
{
|
||||
wantErr: true,
|
||||
},
|
||||
mockedWriter{
|
||||
{
|
||||
wantErr: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "First invalid writer",
|
||||
writers: []io.Writer{
|
||||
mockedWriter{
|
||||
writers: []*mockedWriter{
|
||||
{
|
||||
wantErr: true,
|
||||
},
|
||||
mockedWriter{
|
||||
{
|
||||
wantErr: false,
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "First valid writer",
|
||||
writers: []io.Writer{
|
||||
mockedWriter{
|
||||
writers: []*mockedWriter{
|
||||
{
|
||||
wantErr: false,
|
||||
},
|
||||
mockedWriter{
|
||||
{
|
||||
wantErr: true,
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tt := range tests {
|
||||
writers := tt.writers
|
||||
multiWriter := resilientMultiWriter{writers}
|
||||
for _, test := range tests {
|
||||
t.Run(test.name, func(t *testing.T) {
|
||||
writers := []io.Writer{}
|
||||
for _, w := range test.writers {
|
||||
writers = append(writers, w)
|
||||
}
|
||||
multiWriter := resilientMultiWriter{zerolog.InfoLevel, writers, nil}
|
||||
|
||||
logger := zerolog.New(multiWriter).With().Timestamp().Logger().Level(zerolog.InfoLevel)
|
||||
logger.Info().Msg("Test msg")
|
||||
logger := zerolog.New(multiWriter).With().Timestamp().Logger()
|
||||
logger.Info().Msg("Test msg")
|
||||
|
||||
assert.Equal(t, len(writers), writeCalls)
|
||||
writeCalls = 0
|
||||
for _, w := range test.writers {
|
||||
// Expect each writer to be written to regardless of the previous writers returning an error
|
||||
assert.Equal(t, 1, w.writeCalls)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
type mockedManagementWriter struct {
|
||||
WriteCalls int
|
||||
}
|
||||
|
||||
func (c *mockedManagementWriter) Write(p []byte) (int, error) {
|
||||
return len(p), nil
|
||||
}
|
||||
|
||||
func (c *mockedManagementWriter) WriteLevel(level zerolog.Level, p []byte) (int, error) {
|
||||
c.WriteCalls++
|
||||
return len(p), nil
|
||||
}
|
||||
|
||||
// Tests that management writer receives write calls of all levels except Disabled
|
||||
func TestResilientMultiWriter_Management(t *testing.T) {
|
||||
for _, level := range []zerolog.Level{
|
||||
zerolog.DebugLevel,
|
||||
zerolog.InfoLevel,
|
||||
zerolog.WarnLevel,
|
||||
zerolog.ErrorLevel,
|
||||
zerolog.FatalLevel,
|
||||
zerolog.PanicLevel,
|
||||
} {
|
||||
t.Run(level.String(), func(t *testing.T) {
|
||||
managementWriter := mockedManagementWriter{}
|
||||
multiWriter := resilientMultiWriter{level, []io.Writer{&mockedWriter{}}, &managementWriter}
|
||||
|
||||
logger := zerolog.New(multiWriter).With().Timestamp().Logger()
|
||||
logger.Info().Msg("Test msg")
|
||||
|
||||
// Always write to management
|
||||
assert.Equal(t, 1, managementWriter.WriteCalls)
|
||||
})
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user