Skip to content

Commit

Permalink
*: all builtin loggers correctly handle empty config object
Browse files Browse the repository at this point in the history
  • Loading branch information
unknwon committed Nov 6, 2019
1 parent 8c244cf commit a6b3750
Show file tree
Hide file tree
Showing 9 changed files with 35 additions and 0 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ coverage:

clean:
go clean
rm -f clog.log
rm -f coverage.out
4 changes: 4 additions & 0 deletions console.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ func (l *consoleLogger) Write(m Messager) error {

func init() {
NewRegister(ModeConsole, func(v interface{}) (Logger, error) {
if v == nil {
v = ConsoleConfig{}
}

cfg, ok := v.(ConsoleConfig)
if !ok {
return nil, fmt.Errorf("invalid config object: want %T got %T", ConsoleConfig{}, v)
Expand Down
4 changes: 4 additions & 0 deletions console_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ func Test_ModeConsole(t *testing.T) {
wantLevel Level
wantErr error
}{
{
name: "nil config",
wantErr: nil,
},
{
name: "valid config",
config: ConsoleConfig{
Expand Down
4 changes: 4 additions & 0 deletions discord.go
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,10 @@ func (l *discordLogger) Write(m Messager) error {

func init() {
NewRegister(ModeDiscord, func(v interface{}) (Logger, error) {
if v == nil {
v = DiscordConfig{}
}

cfg, ok := v.(DiscordConfig)
if !ok {
return nil, fmt.Errorf("invalid config object: want %T got %T", DiscordConfig{}, v)
Expand Down
4 changes: 4 additions & 0 deletions discord_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@ func Test_ModeDiscord(t *testing.T) {
wantLevel Level
wantErr error
}{
{
name: "nil config",
wantErr: errors.New("initialize logger: empty URL"),
},
{
name: "valid config",
config: DiscordConfig{
Expand Down
6 changes: 6 additions & 0 deletions file.go
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,12 @@ func (l *fileLogger) init() error {

func init() {
NewRegister(ModeFile, func(v interface{}) (Logger, error) {
if v == nil {
v = FileConfig{
Filename: "clog.log",
}
}

cfg, ok := v.(FileConfig)
if !ok {
return nil, fmt.Errorf("invalid config object: want %T got %T", FileConfig{}, v)
Expand Down
4 changes: 4 additions & 0 deletions file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ func Test_ModeFile(t *testing.T) {
wantLevel Level
wantErr error
}{
{
name: "nil config",
wantErr: nil,
},
{
name: "valid config",
config: FileConfig{
Expand Down
4 changes: 4 additions & 0 deletions slack.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@ func (l *slackLogger) Write(m Messager) error {

func init() {
NewRegister(ModeSlack, func(v interface{}) (Logger, error) {
if v == nil {
v = SlackConfig{}
}

cfg, ok := v.(SlackConfig)
if !ok {
return nil, fmt.Errorf("invalid config object: want %T got %T", SlackConfig{}, v)
Expand Down
4 changes: 4 additions & 0 deletions slack_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ func Test_ModeSlack(t *testing.T) {
wantLevel Level
wantErr error
}{
{
name: "nil config",
wantErr: errors.New("initialize logger: empty URL"),
},
{
name: "valid config",
config: SlackConfig{
Expand Down

0 comments on commit a6b3750

Please sign in to comment.