Skip to content

Commit 3bdf969

Browse files
committed
refactor(serverLog): simplify code
1 parent 1de0b57 commit 3bdf969

File tree

2 files changed

+16
-20
lines changed

2 files changed

+16
-20
lines changed

src/serverLog/logMan.go

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
package serverLog
22

33
import (
4+
"../util"
5+
"bytes"
6+
"fmt"
47
"os"
58
"sync"
9+
"time"
610
)
711

812
type logMan struct {
@@ -14,6 +18,16 @@ type logMan struct {
1418
wg sync.WaitGroup
1519
}
1620

21+
func getLogEntry(payload []byte) []byte {
22+
buffer := &bytes.Buffer{}
23+
buffer.WriteString(util.FormatTimeSecond(time.Now()))
24+
buffer.WriteByte(' ')
25+
buffer.Write(payload)
26+
buffer.WriteByte('\n')
27+
28+
return buffer.Bytes()
29+
}
30+
1731
func (l *logMan) Open() (err error) {
1832
if len(l.filename) == 0 {
1933
return
@@ -41,15 +55,10 @@ func (l *logMan) Enable() {
4155

4256
l.wg.Add(1)
4357
go func() {
44-
for {
45-
payload, ok := <-ch
46-
if !ok {
47-
break
48-
}
49-
58+
for payload := range ch {
5059
_, e := l.file.Write(getLogEntry(payload))
5160
if e != nil {
52-
os.Stderr.WriteString(e.Error() + "\n")
61+
fmt.Fprintln(os.Stderr, e)
5362
}
5463
}
5564
l.wg.Done()

src/serverLog/main.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
package serverLog
22

33
import (
4-
"../util"
5-
"bytes"
64
"os"
7-
"time"
85
)
96

107
const CHAN_BUFFER = 7
@@ -14,16 +11,6 @@ type Logger struct {
1411
errLogMan *logMan
1512
}
1613

17-
func getLogEntry(payload []byte) []byte {
18-
buffer := &bytes.Buffer{}
19-
buffer.WriteString(util.FormatTimeSecond(time.Now()))
20-
buffer.WriteByte(' ')
21-
buffer.Write(payload)
22-
buffer.WriteByte('\n')
23-
24-
return buffer.Bytes()
25-
}
26-
2714
func (l *Logger) CanLogAccess() bool {
2815
return l.accLogMan.CanLog()
2916
}

0 commit comments

Comments
 (0)