File tree Expand file tree Collapse file tree 2 files changed +16
-20
lines changed Expand file tree Collapse file tree 2 files changed +16
-20
lines changed Original file line number Diff line number Diff line change 1
1
package serverLog
2
2
3
3
import (
4
+ "../util"
5
+ "bytes"
6
+ "fmt"
4
7
"os"
5
8
"sync"
9
+ "time"
6
10
)
7
11
8
12
type logMan struct {
@@ -14,6 +18,16 @@ type logMan struct {
14
18
wg sync.WaitGroup
15
19
}
16
20
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
+
17
31
func (l * logMan ) Open () (err error ) {
18
32
if len (l .filename ) == 0 {
19
33
return
@@ -41,15 +55,10 @@ func (l *logMan) Enable() {
41
55
42
56
l .wg .Add (1 )
43
57
go func () {
44
- for {
45
- payload , ok := <- ch
46
- if ! ok {
47
- break
48
- }
49
-
58
+ for payload := range ch {
50
59
_ , e := l .file .Write (getLogEntry (payload ))
51
60
if e != nil {
52
- os . Stderr . WriteString ( e . Error () + " \n " )
61
+ fmt . Fprintln ( os . Stderr , e )
53
62
}
54
63
}
55
64
l .wg .Done ()
Original file line number Diff line number Diff line change 1
1
package serverLog
2
2
3
3
import (
4
- "../util"
5
- "bytes"
6
4
"os"
7
- "time"
8
5
)
9
6
10
7
const CHAN_BUFFER = 7
@@ -14,16 +11,6 @@ type Logger struct {
14
11
errLogMan * logMan
15
12
}
16
13
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
-
27
14
func (l * Logger ) CanLogAccess () bool {
28
15
return l .accLogMan .CanLog ()
29
16
}
You can’t perform that action at this time.
0 commit comments