setwriter added and cleanup

Author: jeevatkm

console_receiver.go

@@ -70,6 +70,11 @@ func (c *ConsoleReceiver) SetPattern(pattern string) error {
 	return nil
 }
 
+// SetWriter method sets the given writer into console receiver.
+func (c *ConsoleReceiver) SetWriter(w io.Writer) {
+	c.out = w
+}
+
 // IsCallerInfo method returns true if log receiver is configured with caller info
 // otherwise false.
 func (c *ConsoleReceiver) IsCallerInfo() bool {

console_receiver_test.go

@@ -5,6 +5,7 @@
 package log
 
 import (
+	"io/ioutil"
 	"os"
 	"testing"
 
@@ -95,6 +96,7 @@ func TestConsoleLoggerDefaults(t *testing.T) {
 	logger, err := New(cfg)
 	assert.NotNil(t, logger)
 	assert.Nil(t, err)
+	logger.SetWriter(ioutil.Discard)
 
 	// receiver nil scenario
 	logger.receiver = nil

discard_receiver.go

@@ -91,6 +91,11 @@ func (f *FileReceiver) SetPattern(pattern string) error {
 	return nil
 }
 
+// SetWriter method sets the given writer into file receiver.
+func (f *FileReceiver) SetWriter(w io.Writer) {
+	f.out = w
+}
+
 // IsCallerInfo method returns true if log receiver is configured with caller info
 // otherwise false.
 func (f *FileReceiver) IsCallerInfo() bool {
@@ -173,7 +178,7 @@ func (f *FileReceiver) openFile() error {
 		return err
 	}
 
-	f.out = file
+	f.SetWriter(file)
 	f.isClosed = false
 	f.stats = &receiverStats{}
 	f.stats.bytes = fileStat.Size()

file_receiver.go

@@ -5,6 +5,7 @@
 package log
 
 import (
+	"io/ioutil"
 	"testing"
 
 	"aahframework.org/config.v0"
@@ -158,4 +159,5 @@ func testFileLogger(t *testing.T, cfgStr string, loop int) {
 	}
 
 	assert.NotNil(t, logger.ToGoLogger())
+	logger.SetWriter(ioutil.Discard)
 }

file_receiver_test.go

@@ -64,10 +64,11 @@ var (
 
 type (
 	// Receiver is the interface for pluggable log receiver.
-	// For e.g: Console, File, HTTP, etc
+	// For e.g: Console, File
 	Receiver interface {
 		Init(cfg *config.Config) error
 		SetPattern(pattern string) error
+		SetWriter(w io.Writer)
 		IsCallerInfo() bool
 		Writer() io.Writer
 		Log(e *Entry)
@@ -137,7 +138,7 @@ func (l *Logger) SetLevel(level string) error {
 	return nil
 }
 
-// SetPattern methods sets the log format pattern.
+// SetPattern method sets the log format pattern.
 func (l *Logger) SetPattern(pattern string) error {
 	l.m.Lock()
 	defer l.m.Unlock()
@@ -147,7 +148,7 @@ func (l *Logger) SetPattern(pattern string) error {
 	return l.receiver.SetPattern(pattern)
 }
 
-// SetReceiver sets the given receiver into logger instance.
+// SetReceiver method sets the given receiver into logger instance.
 func (l *Logger) SetReceiver(receiver Receiver) error {
 	l.m.Lock()
 	defer l.m.Unlock()
@@ -160,6 +161,13 @@ func (l *Logger) SetReceiver(receiver Receiver) error {
 	return l.receiver.Init(l.cfg)
 }
 
+// SetWriter method sets the given writer into logger instance.
+func (l *Logger) SetWriter(w io.Writer) {
+	l.m.Lock()
+	defer l.m.Unlock()
+	l.receiver.SetWriter(w)
+}
+
 // ToGoLogger method wraps the current log writer into Go Logger instance.
 func (l *Logger) ToGoLogger() *slog.Logger {
 	return slog.New(l.receiver.Writer(), "", slog.LstdFlags)

log.go

@@ -66,14 +66,6 @@ func TestMisc(t *testing.T) {
 	assert.NotNil(t, err)
 	assert.Equal(t, "log: config is nil", err.Error())
 
-	// Discard
-	discard := getReceiverByName("DISCARD")
-	_ = discard.Init(nil)
-	discard.Log(&Entry{})
-	_ = discard.SetPattern("nothing")
-	assert.False(t, discard.IsCallerInfo())
-	assert.NotNil(t, discard.Writer())
-
 	// util
 	assert.Nil(t, getReceiverByName("SMTP"))
 	assert.Equal(t, "", formatTime(time.Time{}))

log_test.go

@@ -46,14 +46,6 @@ func levelByName(name string) level {
 	return LevelUnknown
 }
 
-func fmtFlagByName(name string) ess.FmtFlag {
-	if flag, ok := FmtFlags[name]; ok {
-		return flag
-	}
-
-	return FmtFlagUnknown
-}
-
 func isFmtFlagExists(flags []ess.FmtFlagPart, flag ess.FmtFlag) bool {
 	for _, f := range flags {
 		if f.Flag == flag {
@@ -85,8 +77,6 @@ func getReceiverByName(name string) Receiver {
 		return &FileReceiver{}
 	case "CONSOLE":
 		return &ConsoleReceiver{}
-	case "DISCARD":
-		return &DiscardReceiver{}
 	default:
 		return nil
 	}