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
0814eefa
Commit
0814eefa
authored
Mar 24, 2016
by
JessonChan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
refactor writeMsg function
parent
8344a605
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
8 deletions
+14
-8
es.go
logs/es/es.go
+1
-1
log.go
logs/log.go
+13
-7
No files found.
logs/es/es.go
View file @
0814eefa
...
...
@@ -76,5 +76,5 @@ func (el *esLogger) Flush() {
}
func
init
()
{
logs
.
Register
(
logs
.
AdaterEs
,
NewES
)
logs
.
Register
(
logs
.
Ada
p
terEs
,
NewES
)
}
logs/log.go
View file @
0814eefa
...
...
@@ -56,14 +56,16 @@ const (
LevelInformational
LevelDebug
)
const
levelCustom
=
-
1
// Name for adapter with beego official support
const
(
AdapterConsole
=
"console"
AdapterFile
=
"file"
AdapterMultiFile
=
"multifile"
AdapterMail
=
"stmp"
AdapterConn
=
"conn"
Ada
terEs
=
"es"
Ada
pterEs
=
"es"
)
// Legacy loglevel constants to ensure backwards compatibility.
...
...
@@ -75,7 +77,7 @@ const (
LevelWarn
=
LevelWarning
)
type
loggerType
func
()
Logger
type
newLoggerFunc
func
()
Logger
// Logger defines the behavior of a log provider.
type
Logger
interface
{
...
...
@@ -85,12 +87,13 @@ type Logger interface {
Flush
()
}
var
adapters
=
make
(
map
[
string
]
loggerType
)
var
adapters
=
make
(
map
[
string
]
newLoggerFunc
)
var
levelPrefix
=
[
LevelDebug
+
1
]
string
{
"[M] "
,
"[A] "
,
"[C] "
,
"[E] "
,
"[W] "
,
"[N] "
,
"[I] "
,
"[D] "
}
// Register makes a log provide available by the provided name.
// If Register is called twice with the same name or if driver is nil,
// it panics.
func
Register
(
name
string
,
log
loggerType
)
{
func
Register
(
name
string
,
log
newLoggerFunc
)
{
if
log
==
nil
{
panic
(
"logs: Register provide is nil"
)
}
...
...
@@ -222,14 +225,18 @@ func (bl *BeeLogger) Write(p []byte) (n int, err error) {
p
=
p
[
0
:
len
(
p
)
-
1
]
}
// set LevelCritical to ensure all log message will be write out
err
=
bl
.
writeMsg
(
LevelCritical
,
string
(
p
))
err
=
bl
.
writeMsg
(
levelCustom
,
string
(
p
))
if
err
==
nil
{
return
len
(
p
),
err
}
return
0
,
err
}
func
(
bl
*
BeeLogger
)
writeMsg
(
logLevel
int
,
msg
string
)
error
{
func
(
bl
*
BeeLogger
)
writeMsg
(
logLevel
int
,
msg
string
,
v
...
interface
{})
error
{
if
logLevel
!=
levelCustom
{
msg
=
levelPrefix
[
logLevel
]
+
msg
}
msg
=
fmt
.
Sprintf
(
msg
,
v
...
)
when
:=
time
.
Now
()
if
bl
.
enableFuncCallDepth
{
_
,
file
,
line
,
ok
:=
runtime
.
Caller
(
bl
.
loggerFuncCallDepth
)
...
...
@@ -561,7 +568,6 @@ func Informational(f interface{}, v ...interface{}) {
// Info compatibility alias for Warning()
func
Info
(
f
interface
{},
v
...
interface
{})
{
fmt
.
Print
()
beeLogger
.
Info
(
formatLog
(
f
,
v
...
))
}
...
...
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