Finalizing for 1.2.0
This commit is contained in:
@@ -3,7 +3,6 @@ package logging
|
||||
import (
|
||||
`errors`
|
||||
"fmt"
|
||||
"io"
|
||||
`io/fs`
|
||||
"log"
|
||||
"os"
|
||||
@@ -13,8 +12,6 @@ import (
|
||||
// Setup sets up/configures a FileLogger and prepares it for use.
|
||||
func (l *FileLogger) Setup() (err error) {
|
||||
|
||||
var multi io.Writer
|
||||
|
||||
// This uses a shared handle across the import. We don't want that.
|
||||
// l.Logger = log.Default()
|
||||
if l.Prefix != "" {
|
||||
@@ -25,19 +22,7 @@ func (l *FileLogger) Setup() (err error) {
|
||||
return
|
||||
}
|
||||
|
||||
// https://stackoverflow.com/a/36719588/733214
|
||||
switch {
|
||||
case l.EnableStdErr && l.EnableStdOut:
|
||||
multi = io.MultiWriter(os.Stdout, os.Stderr, l.writer)
|
||||
case l.EnableStdErr:
|
||||
multi = io.MultiWriter(os.Stderr, l.writer)
|
||||
case l.EnableStdOut:
|
||||
multi = io.MultiWriter(os.Stdout, l.writer)
|
||||
default:
|
||||
multi = l.writer
|
||||
}
|
||||
|
||||
l.Logger = log.New(multi, l.Prefix, l.LogFlags)
|
||||
l.Logger = log.New(l.writer, l.Prefix, l.LogFlags)
|
||||
// l.Logger.SetOutput(multi)
|
||||
|
||||
return
|
||||
@@ -50,6 +35,8 @@ func (l *FileLogger) Shutdown() (err error) {
|
||||
if !errors.Is(err, fs.ErrClosed) {
|
||||
return
|
||||
}
|
||||
err = nil
|
||||
return err
|
||||
}
|
||||
|
||||
return
|
||||
|
||||
Reference in New Issue
Block a user