diff --git a/pkg/logging/logger.go b/pkg/logging/logger.go index 0f59f7d..6168e77 100644 --- a/pkg/logging/logger.go +++ b/pkg/logging/logger.go @@ -12,23 +12,24 @@ import ( ) type Logger struct { - file io.WriteCloser - toStdout bool - mut sync.Mutex + sync.Mutex + file io.WriteCloser } -// NewLogger creates a Logger instance with given filename and -// toStdout tells wether to write to Stdout as well or not. -func NewLogger(path string, toStdout bool) (*Logger, error) { +// New creates a Logger instance with a given filename +func New(path string) (*Logger, error) { f, err := os.OpenFile(path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0660) if err != nil { return nil, errors.Wrap(err, "failed to open log file") } - return &Logger{file: f, toStdout: toStdout}, nil + return &Logger{file: f}, nil } func (l *Logger) Reopen(path string) error { + l.Lock() + defer l.Unlock() + f, err := os.OpenFile(path, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0660) if err != nil { return err @@ -40,21 +41,17 @@ func (l *Logger) Reopen(path string) error { } func (l *Logger) Println(v ...interface{}) { - l.mut.Lock() - defer l.mut.Unlock() + l.Lock() + defer l.Unlock() nowStr := time.Now().UTC().Format(time.RFC3339) fmt.Fprintln(l.file, nowStr, v) - - if l.toStdout { - fmt.Println(v...) - } } func (l *Logger) Printf(format string, v ...interface{}) { - l.mut.Lock() - defer l.mut.Unlock() + l.Lock() + defer l.Unlock() // Ensure a new line will be written if !strings.HasSuffix(format, "\n") { @@ -65,28 +62,21 @@ func (l *Logger) Printf(format string, v ...interface{}) { fmt.Fprintf(l.file, nowStr+" "+format, v...) - if l.toStdout { - fmt.Printf(format, v...) - } } func (l *Logger) Fatalln(v ...interface{}) { - l.mut.Lock() + l.Lock() nowStr := time.Now().UTC().Format(time.RFC3339) fmt.Fprintln(l.file, nowStr, v) - if l.toStdout { - fmt.Println(v...) - } - l.file.Close() os.Exit(1) } func (l *Logger) Fatalf(format string, v ...interface{}) { - l.mut.Lock() + l.Lock() // Ensure a new line will be written if !strings.HasSuffix(format, "\n") { @@ -97,10 +87,6 @@ func (l *Logger) Fatalf(format string, v ...interface{}) { fmt.Fprintf(l.file, nowStr+" "+format, v...) - if l.toStdout { - fmt.Printf(format, v...) - } - l.file.Close() os.Exit(1) }