Skip to content

Commit 4d11620

Browse files
committed
change: rolls back the (unrelated, unnecessary) logger changes
1 parent 7ba1437 commit 4d11620

File tree

2 files changed

+4
-35
lines changed

2 files changed

+4
-35
lines changed

Diff for: logger/logger.go

+3-32
Original file line numberDiff line numberDiff line change
@@ -3,53 +3,24 @@
33

44
package logger
55

6-
import (
7-
"fmt"
8-
"io"
9-
"os"
10-
)
6+
import "fmt"
117

128
type Logger struct {
139
Prints chan string
14-
fout io.WriteCloser
1510
}
1611

17-
func Init(file string) *Logger {
18-
l := Logger{
19-
Prints: make(chan string, 100),
20-
}
21-
if file != "" {
22-
var err error
23-
l.fout, err = os.Create(file)
24-
if err != nil {
25-
fmt.Printf("error opening requested log file %q\n", file)
26-
}
27-
}
28-
return &l
12+
func Init() *Logger {
13+
return &Logger{make(chan string, 100)}
2914
}
3015

3116
func (l *Logger) Print(s string) {
32-
if l.fout != nil {
33-
fmt.Fprintf(l.fout, "%s\n", s)
34-
}
3517
l.Prints <- s
3618
}
3719

3820
func (l *Logger) Printf(s string, as ...interface{}) {
39-
if l.fout != nil {
40-
fmt.Fprintf(l.fout, s, as...)
41-
fmt.Fprintf(l.fout, "\n")
42-
}
4321
l.Prints <- fmt.Sprintf(s, as...)
4422
}
4523

4624
func (l *Logger) PrintError(source string, err error) {
4725
l.Printf("Error(%s) -> %s", source, err.Error())
4826
}
49-
50-
func (l *Logger) Close() error {
51-
if l.fout != nil {
52-
return l.fout.Close()
53-
}
54-
return nil
55-
}

Diff for: stmps.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,6 @@ func main() {
113113
memprofile := flag.String("memprofile", "", "write memory profile to `file`")
114114
configFile := flag.String("config", "", "use config `file`")
115115
version := flag.Bool("version", false, "print the stmps version and exit")
116-
logFile := flag.String("log", "", "also write logs to this file")
117116

118117
flag.Parse()
119118
if *help {
@@ -158,8 +157,7 @@ func main() {
158157
osExit(2)
159158
}
160159

161-
logger := logger.Init(*logFile)
162-
defer logger.Close()
160+
logger := logger.Init()
163161
initCommandHandler(logger)
164162

165163
// init mpv engine

0 commit comments

Comments
 (0)