Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
beego
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
go
beego
Commits
a1cb0007
Commit
a1cb0007
authored
Feb 03, 2016
by
JessonChan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove log package
parent
36022016
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
80 additions
and
65 deletions
+80
-65
conn.go
logs/conn.go
+7
-10
console.go
logs/console.go
+4
-7
file.go
logs/file.go
+4
-6
log.go
logs/log.go
+0
-42
logger.go
logs/logger.go
+65
-0
No files found.
logs/conn.go
View file @
a1cb0007
...
...
@@ -17,7 +17,6 @@ package logs
import
(
"encoding/json"
"io"
"log"
"net"
"time"
)
...
...
@@ -25,7 +24,7 @@ import (
// connWriter implements LoggerInterface.
// it writes messages in keep-live tcp connection.
type
connWriter
struct
{
lg
*
log
.
Logg
er
lg
*
log
Writ
er
innerWriter
io
.
WriteCloser
ReconnectOnMsg
bool
`json:"reconnectOnMsg"`
Reconnect
bool
`json:"reconnect"`
...
...
@@ -43,8 +42,8 @@ func NewConn() Logger {
// Init init connection writer with json config.
// json config only need key "level".
func
(
c
*
connWriter
)
Init
(
json
c
onfig
string
)
error
{
return
json
.
Unmarshal
([]
byte
(
json
c
onfig
),
c
)
func
(
c
*
connWriter
)
Init
(
json
C
onfig
string
)
error
{
return
json
.
Unmarshal
([]
byte
(
json
C
onfig
),
c
)
}
// WriteMsg write message in connection.
...
...
@@ -53,7 +52,7 @@ func (c *connWriter) WriteMsg(when time.Time, msg string, level int) error {
if
level
>
c
.
Level
{
return
nil
}
if
c
.
ne
dded
ConnectOnMsg
()
{
if
c
.
ne
edTo
ConnectOnMsg
()
{
err
:=
c
.
connect
()
if
err
!=
nil
{
return
err
...
...
@@ -64,9 +63,7 @@ func (c *connWriter) WriteMsg(when time.Time, msg string, level int) error {
defer
c
.
innerWriter
.
Close
()
}
msg
=
formatLogTime
(
when
)
+
msg
c
.
lg
.
Println
(
msg
)
c
.
lg
.
println
(
when
,
msg
)
return
nil
}
...
...
@@ -98,11 +95,11 @@ func (c *connWriter) connect() error {
}
c
.
innerWriter
=
conn
c
.
lg
=
log
.
New
(
conn
,
""
,
0
)
c
.
lg
=
newLogWriter
(
conn
)
return
nil
}
func
(
c
*
connWriter
)
ne
dded
ConnectOnMsg
()
bool
{
func
(
c
*
connWriter
)
ne
edTo
ConnectOnMsg
()
bool
{
if
c
.
Reconnect
{
c
.
Reconnect
=
false
return
true
...
...
logs/console.go
View file @
a1cb0007
...
...
@@ -16,7 +16,6 @@ package logs
import
(
"encoding/json"
"log"
"os"
"runtime"
"time"
...
...
@@ -47,7 +46,7 @@ var colors = []brush{
// consoleWriter implements LoggerInterface and writes messages to terminal.
type
consoleWriter
struct
{
lg
*
log
.
Logg
er
lg
*
log
Writ
er
Level
int
`json:"level"`
Colorful
bool
`json:"color"`
//this filed is useful only when system's terminal supports color
}
...
...
@@ -55,7 +54,7 @@ type consoleWriter struct {
// NewConsole create ConsoleWriter returning as LoggerInterface.
func
NewConsole
()
Logger
{
cw
:=
&
consoleWriter
{
lg
:
log
.
New
(
os
.
Stdout
,
""
,
0
),
lg
:
newLogWriter
(
os
.
Stdout
),
Level
:
LevelDebug
,
Colorful
:
true
,
}
...
...
@@ -80,12 +79,10 @@ func (c *consoleWriter) WriteMsg(when time.Time, msg string, level int) error {
if
level
>
c
.
Level
{
return
nil
}
msg
=
formatLogTime
(
when
)
+
msg
if
c
.
Colorful
{
c
.
lg
.
Println
(
colors
[
level
](
msg
))
}
else
{
c
.
lg
.
Println
(
msg
)
msg
=
colors
[
level
](
msg
)
}
c
.
lg
.
println
(
when
,
msg
)
return
nil
}
...
...
logs/file.go
View file @
a1cb0007
...
...
@@ -118,13 +118,11 @@ func (w *fileLogWriter) WriteMsg(when time.Time, msg string, level int) error {
if
level
>
w
.
Level
{
return
nil
}
msg
=
formatLogTime
(
when
)
+
msg
+
"
\n
"
h
,
d
:=
formatTimeHeader
(
when
)
if
w
.
Rotate
{
d
:=
when
.
Day
()
if
w
.
needRotate
(
len
(
msg
),
d
)
{
if
w
.
needRotate
(
len
(
h
)
+
len
(
msg
)
+
1
,
d
)
{
w
.
Lock
()
if
w
.
needRotate
(
len
(
msg
)
,
d
)
{
if
w
.
needRotate
(
len
(
h
)
+
len
(
msg
)
+
1
,
d
)
{
if
err
:=
w
.
doRotate
(
when
);
err
!=
nil
{
fmt
.
Fprintf
(
os
.
Stderr
,
"FileLogWriter(%q): %s
\n
"
,
w
.
Filename
,
err
)
}
...
...
@@ -134,7 +132,7 @@ func (w *fileLogWriter) WriteMsg(when time.Time, msg string, level int) error {
}
w
.
Lock
()
_
,
err
:=
w
.
fileWriter
.
Write
(
[]
byte
(
msg
))
_
,
err
:=
w
.
fileWriter
.
Write
(
append
(
append
(
h
,
msg
...
),
'\n'
))
if
err
==
nil
{
w
.
maxLinesCurLines
++
w
.
maxSizeCurSize
+=
len
(
msg
)
...
...
logs/log.go
View file @
a1cb0007
...
...
@@ -367,45 +367,3 @@ func (bl *BeeLogger) Close() {
}
bl
.
outputs
=
nil
}
func
formatLogTime
(
when
time
.
Time
)
string
{
y
,
mo
,
d
:=
when
.
Date
()
h
,
mi
,
s
:=
when
.
Clock
()
//len(2006/01/02 15:03:04)==19
var
buf
[
20
]
byte
t
:=
3
for
y
>=
10
{
p
:=
y
/
10
buf
[
t
]
=
byte
(
'0'
+
y
-
p
*
10
)
y
=
p
t
--
}
buf
[
0
]
=
byte
(
'0'
+
y
)
buf
[
4
]
=
'/'
if
mo
>
9
{
buf
[
5
]
=
'1'
buf
[
6
]
=
byte
(
'0'
+
mo
-
9
)
}
else
{
buf
[
5
]
=
'0'
buf
[
6
]
=
byte
(
'0'
+
mo
)
}
buf
[
7
]
=
'/'
t
=
d
/
10
buf
[
8
]
=
byte
(
'0'
+
t
)
buf
[
9
]
=
byte
(
'0'
+
d
-
t
*
10
)
buf
[
10
]
=
' '
t
=
h
/
10
buf
[
11
]
=
byte
(
'0'
+
t
)
buf
[
12
]
=
byte
(
'0'
+
h
-
t
*
10
)
buf
[
13
]
=
':'
t
=
mi
/
10
buf
[
14
]
=
byte
(
'0'
+
t
)
buf
[
15
]
=
byte
(
'0'
+
mi
-
t
*
10
)
buf
[
16
]
=
':'
t
=
s
/
10
buf
[
17
]
=
byte
(
'0'
+
t
)
buf
[
18
]
=
byte
(
'0'
+
s
-
t
*
10
)
buf
[
19
]
=
' '
return
string
(
buf
[
0
:
])
}
logs/logger.go
0 → 100644
View file @
a1cb0007
package
logs
import
(
"io"
"sync"
"time"
)
type
logWriter
struct
{
sync
.
Mutex
writer
io
.
Writer
}
func
newLogWriter
(
wr
io
.
Writer
)
*
logWriter
{
return
&
logWriter
{
writer
:
wr
}
}
func
(
lg
*
logWriter
)
println
(
when
time
.
Time
,
msg
string
)
{
lg
.
Lock
()
h
,
_
:=
formatTimeHeader
(
when
)
lg
.
writer
.
Write
(
append
(
append
(
h
,
msg
...
),
'\n'
))
lg
.
Unlock
()
}
func
formatTimeHeader
(
when
time
.
Time
)
([]
byte
,
int
)
{
y
,
mo
,
d
:=
when
.
Date
()
h
,
mi
,
s
:=
when
.
Clock
()
//len(2006/01/02 15:03:04)==19
var
buf
[
20
]
byte
t
:=
3
for
y
>=
10
{
p
:=
y
/
10
buf
[
t
]
=
byte
(
'0'
+
y
-
p
*
10
)
y
=
p
t
--
}
buf
[
0
]
=
byte
(
'0'
+
y
)
buf
[
4
]
=
'/'
if
mo
>
9
{
buf
[
5
]
=
'1'
buf
[
6
]
=
byte
(
'0'
+
mo
-
9
)
}
else
{
buf
[
5
]
=
'0'
buf
[
6
]
=
byte
(
'0'
+
mo
)
}
buf
[
7
]
=
'/'
t
=
d
/
10
buf
[
8
]
=
byte
(
'0'
+
t
)
buf
[
9
]
=
byte
(
'0'
+
d
-
t
*
10
)
buf
[
10
]
=
' '
t
=
h
/
10
buf
[
11
]
=
byte
(
'0'
+
t
)
buf
[
12
]
=
byte
(
'0'
+
h
-
t
*
10
)
buf
[
13
]
=
':'
t
=
mi
/
10
buf
[
14
]
=
byte
(
'0'
+
t
)
buf
[
15
]
=
byte
(
'0'
+
mi
-
t
*
10
)
buf
[
16
]
=
':'
t
=
s
/
10
buf
[
17
]
=
byte
(
'0'
+
t
)
buf
[
18
]
=
byte
(
'0'
+
s
-
t
*
10
)
buf
[
19
]
=
' '
return
buf
[
0
:
],
d
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment