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
77c11091
Commit
77c11091
authored
Feb 23, 2015
by
fuxiaohei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
code simplify for package logs
parent
29d48238
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
31 deletions
+18
-31
conn.go
logs/conn.go
+3
-8
console.go
logs/console.go
+8
-10
file.go
logs/file.go
+2
-7
log.go
logs/log.go
+2
-2
smtp.go
logs/smtp.go
+3
-4
No files found.
logs/conn.go
View file @
77c11091
...
...
@@ -43,11 +43,7 @@ func NewConn() LoggerInterface {
// init connection writer with json config.
// json config only need key "level".
func
(
c
*
ConnWriter
)
Init
(
jsonconfig
string
)
error
{
err
:=
json
.
Unmarshal
([]
byte
(
jsonconfig
),
c
)
if
err
!=
nil
{
return
err
}
return
nil
return
json
.
Unmarshal
([]
byte
(
jsonconfig
),
c
)
}
// write message in connection.
...
...
@@ -77,10 +73,9 @@ func (c *ConnWriter) Flush() {
// destroy connection writer and close tcp listener.
func
(
c
*
ConnWriter
)
Destroy
()
{
if
c
.
innerWriter
==
nil
{
return
}
if
c
.
innerWriter
!=
nil
{
c
.
innerWriter
.
Close
()
}
}
func
(
c
*
ConnWriter
)
connect
()
error
{
...
...
logs/console.go
View file @
77c11091
...
...
@@ -50,9 +50,10 @@ type ConsoleWriter struct {
// create ConsoleWriter returning as LoggerInterface.
func
NewConsole
()
LoggerInterface
{
cw
:=
new
(
ConsoleWriter
)
cw
.
lg
=
log
.
New
(
os
.
Stdout
,
""
,
log
.
Ldate
|
log
.
Ltime
)
cw
.
Level
=
LevelDebug
cw
:=
&
ConsoleWriter
{
lg
:
log
.
New
(
os
.
Stdout
,
""
,
log
.
Ldate
|
log
.
Ltime
),
Level
:
LevelDebug
,
}
return
cw
}
...
...
@@ -62,11 +63,7 @@ func (c *ConsoleWriter) Init(jsonconfig string) error {
if
len
(
jsonconfig
)
==
0
{
return
nil
}
err
:=
json
.
Unmarshal
([]
byte
(
jsonconfig
),
c
)
if
err
!=
nil
{
return
err
}
return
nil
return
json
.
Unmarshal
([]
byte
(
jsonconfig
),
c
)
}
// write message in console.
...
...
@@ -76,9 +73,10 @@ func (c *ConsoleWriter) WriteMsg(msg string, level int) error {
}
if
goos
:=
runtime
.
GOOS
;
goos
==
"windows"
{
c
.
lg
.
Println
(
msg
)
}
else
{
c
.
lg
.
Println
(
colors
[
level
](
msg
))
return
nil
}
c
.
lg
.
Println
(
colors
[
level
](
msg
))
return
nil
}
...
...
logs/file.go
View file @
77c11091
...
...
@@ -123,11 +123,7 @@ func (w *FileLogWriter) startLogger() error {
return
err
}
w
.
mw
.
SetFd
(
fd
)
err
=
w
.
initFd
()
if
err
!=
nil
{
return
err
}
return
nil
return
w
.
initFd
()
}
func
(
w
*
FileLogWriter
)
docheck
(
size
int
)
{
...
...
@@ -170,14 +166,13 @@ func (w *FileLogWriter) initFd() error {
}
w
.
maxsize_cursize
=
int
(
finfo
.
Size
())
w
.
daily_opendate
=
time
.
Now
()
.
Day
()
w
.
maxlines_curlines
=
0
if
finfo
.
Size
()
>
0
{
count
,
err
:=
w
.
lines
()
if
err
!=
nil
{
return
err
}
w
.
maxlines_curlines
=
count
}
else
{
w
.
maxlines_curlines
=
0
}
return
nil
}
...
...
logs/log.go
View file @
77c11091
...
...
@@ -292,9 +292,9 @@ func (bl *BeeLogger) Close() {
fmt
.
Println
(
"ERROR, unable to WriteMsg (while closing logger):"
,
err
)
}
}
}
else
{
break
continue
}
break
}
for
_
,
l
:=
range
bl
.
outputs
{
l
.
Flush
()
...
...
logs/smtp.go
View file @
77c11091
...
...
@@ -25,7 +25,8 @@ import (
)
const
(
subjectPhrase
=
"Diagnostic message from server"
// no usage
// subjectPhrase = "Diagnostic message from server"
)
// smtpWriter implements LoggerInterface and is used to send emails via given SMTP-server.
...
...
@@ -146,9 +147,7 @@ func (s *SmtpWriter) WriteMsg(msg string, level int) error {
mailmsg
:=
[]
byte
(
"To: "
+
strings
.
Join
(
s
.
RecipientAddresses
,
";"
)
+
"
\r\n
From: "
+
s
.
FromAddress
+
"<"
+
s
.
FromAddress
+
">
\r\n
Subject: "
+
s
.
Subject
+
"
\r\n
"
+
content_type
+
"
\r\n\r\n
"
+
fmt
.
Sprintf
(
".%s"
,
time
.
Now
()
.
Format
(
"2006-01-02 15:04:05"
))
+
msg
)
err
:=
s
.
sendMail
(
s
.
Host
,
auth
,
s
.
FromAddress
,
s
.
RecipientAddresses
,
mailmsg
)
return
err
return
s
.
sendMail
(
s
.
Host
,
auth
,
s
.
FromAddress
,
s
.
RecipientAddresses
,
mailmsg
)
}
// implementing method. empty.
...
...
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