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
98dfecfd
Commit
98dfecfd
authored
Mar 24, 2016
by
JessonChan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change beego log function to logs function
parent
03840f3f
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
43 additions
and
152 deletions
+43
-152
admin.go
admin.go
+3
-2
app.go
app.go
+14
-14
config.go
config.go
+4
-3
hooks.go
hooks.go
+2
-1
log.go
log.go
+0
-116
parser.go
parser.go
+3
-2
router.go
router.go
+9
-8
staticfile.go
staticfile.go
+3
-2
template.go
template.go
+5
-4
No files found.
admin.go
View file @
98dfecfd
...
...
@@ -24,6 +24,7 @@ import (
"time"
"github.com/astaxie/beego/grace"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/toolbox"
"github.com/astaxie/beego/utils"
)
...
...
@@ -410,7 +411,7 @@ func (admin *adminApp) Run() {
for
p
,
f
:=
range
admin
.
routers
{
http
.
Handle
(
p
,
f
)
}
BeeLogger
.
Info
(
"Admin server Running on %s"
,
addr
)
logs
.
Info
(
"Admin server Running on %s"
,
addr
)
var
err
error
if
BConfig
.
Listen
.
Graceful
{
...
...
@@ -419,6 +420,6 @@ func (admin *adminApp) Run() {
err
=
http
.
ListenAndServe
(
addr
,
nil
)
}
if
err
!=
nil
{
BeeLogger
.
Critical
(
"Admin ListenAndServe: "
,
err
,
fmt
.
Sprintf
(
"%d"
,
os
.
Getpid
()))
logs
.
Critical
(
"Admin ListenAndServe: "
,
err
,
fmt
.
Sprintf
(
"%d"
,
os
.
Getpid
()))
}
}
app.go
View file @
98dfecfd
...
...
@@ -16,7 +16,6 @@ package beego
import
(
"fmt"
"log"
"net"
"net/http"
"net/http/fcgi"
...
...
@@ -25,6 +24,7 @@ import (
"time"
"github.com/astaxie/beego/grace"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/utils"
)
...
...
@@ -69,9 +69,9 @@ func (app *App) Run() {
if
BConfig
.
Listen
.
EnableFcgi
{
if
BConfig
.
Listen
.
EnableStdIo
{
if
err
=
fcgi
.
Serve
(
nil
,
app
.
Handlers
);
err
==
nil
{
// standard I/O
BeeLogger
.
Info
(
"Use FCGI via standard I/O"
)
logs
.
Info
(
"Use FCGI via standard I/O"
)
}
else
{
BeeLogger
.
Critical
(
"Cannot use FCGI via standard I/O"
,
err
)
logs
.
Critical
(
"Cannot use FCGI via standard I/O"
,
err
)
}
return
}
...
...
@@ -85,10 +85,10 @@ func (app *App) Run() {
l
,
err
=
net
.
Listen
(
"tcp"
,
addr
)
}
if
err
!=
nil
{
BeeLogger
.
Critical
(
"Listen: "
,
err
)
logs
.
Critical
(
"Listen: "
,
err
)
}
if
err
=
fcgi
.
Serve
(
l
,
app
.
Handlers
);
err
!=
nil
{
BeeLogger
.
Critical
(
"fcgi.Serve: "
,
err
)
logs
.
Critical
(
"fcgi.Serve: "
,
err
)
}
return
}
...
...
@@ -96,7 +96,7 @@ func (app *App) Run() {
app
.
Server
.
Handler
=
app
.
Handlers
app
.
Server
.
ReadTimeout
=
time
.
Duration
(
BConfig
.
Listen
.
ServerTimeOut
)
*
time
.
Second
app
.
Server
.
WriteTimeout
=
time
.
Duration
(
BConfig
.
Listen
.
ServerTimeOut
)
*
time
.
Second
app
.
Server
.
ErrorLog
=
log
.
New
(
BeeLogger
,
""
,
0
)
app
.
Server
.
ErrorLog
=
log
s
.
GetLogger
(
"HTTP"
)
// run graceful mode
if
BConfig
.
Listen
.
Graceful
{
...
...
@@ -113,7 +113,7 @@ func (app *App) Run() {
server
.
Server
.
ReadTimeout
=
app
.
Server
.
ReadTimeout
server
.
Server
.
WriteTimeout
=
app
.
Server
.
WriteTimeout
if
err
:=
server
.
ListenAndServeTLS
(
BConfig
.
Listen
.
HTTPSCertFile
,
BConfig
.
Listen
.
HTTPSKeyFile
);
err
!=
nil
{
BeeLogger
.
Critical
(
"ListenAndServeTLS: "
,
err
,
fmt
.
Sprintf
(
"%d"
,
os
.
Getpid
()))
logs
.
Critical
(
"ListenAndServeTLS: "
,
err
,
fmt
.
Sprintf
(
"%d"
,
os
.
Getpid
()))
time
.
Sleep
(
100
*
time
.
Microsecond
)
endRunning
<-
true
}
...
...
@@ -128,7 +128,7 @@ func (app *App) Run() {
server
.
Network
=
"tcp4"
}
if
err
:=
server
.
ListenAndServe
();
err
!=
nil
{
BeeLogger
.
Critical
(
"ListenAndServe: "
,
err
,
fmt
.
Sprintf
(
"%d"
,
os
.
Getpid
()))
logs
.
Critical
(
"ListenAndServe: "
,
err
,
fmt
.
Sprintf
(
"%d"
,
os
.
Getpid
()))
time
.
Sleep
(
100
*
time
.
Microsecond
)
endRunning
<-
true
}
...
...
@@ -146,9 +146,9 @@ func (app *App) Run() {
if
BConfig
.
Listen
.
HTTPSPort
!=
0
{
app
.
Server
.
Addr
=
fmt
.
Sprintf
(
"%s:%d"
,
BConfig
.
Listen
.
HTTPSAddr
,
BConfig
.
Listen
.
HTTPSPort
)
}
BeeLogger
.
Info
(
"https server Running on %s"
,
app
.
Server
.
Addr
)
logs
.
Info
(
"https server Running on %s"
,
app
.
Server
.
Addr
)
if
err
:=
app
.
Server
.
ListenAndServeTLS
(
BConfig
.
Listen
.
HTTPSCertFile
,
BConfig
.
Listen
.
HTTPSKeyFile
);
err
!=
nil
{
BeeLogger
.
Critical
(
"ListenAndServeTLS: "
,
err
)
logs
.
Critical
(
"ListenAndServeTLS: "
,
err
)
time
.
Sleep
(
100
*
time
.
Microsecond
)
endRunning
<-
true
}
...
...
@@ -157,24 +157,24 @@ func (app *App) Run() {
if
BConfig
.
Listen
.
EnableHTTP
{
go
func
()
{
app
.
Server
.
Addr
=
addr
BeeLogger
.
Info
(
"http server Running on %s"
,
app
.
Server
.
Addr
)
logs
.
Info
(
"http server Running on %s"
,
app
.
Server
.
Addr
)
if
BConfig
.
Listen
.
ListenTCP4
{
ln
,
err
:=
net
.
Listen
(
"tcp4"
,
app
.
Server
.
Addr
)
if
err
!=
nil
{
BeeLogger
.
Critical
(
"ListenAndServe: "
,
err
)
logs
.
Critical
(
"ListenAndServe: "
,
err
)
time
.
Sleep
(
100
*
time
.
Microsecond
)
endRunning
<-
true
return
}
if
err
=
app
.
Server
.
Serve
(
ln
);
err
!=
nil
{
BeeLogger
.
Critical
(
"ListenAndServe: "
,
err
)
logs
.
Critical
(
"ListenAndServe: "
,
err
)
time
.
Sleep
(
100
*
time
.
Microsecond
)
endRunning
<-
true
return
}
}
else
{
if
err
:=
app
.
Server
.
ListenAndServe
();
err
!=
nil
{
BeeLogger
.
Critical
(
"ListenAndServe: "
,
err
)
logs
.
Critical
(
"ListenAndServe: "
,
err
)
time
.
Sleep
(
100
*
time
.
Microsecond
)
endRunning
<-
true
}
...
...
config.go
View file @
98dfecfd
...
...
@@ -21,6 +21,7 @@ import (
"strings"
"github.com/astaxie/beego/config"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/session"
"github.com/astaxie/beego/utils"
)
...
...
@@ -293,14 +294,14 @@ func parseConfig(appConfigPath string) (err error) {
}
//init log
BeeLogger
.
Reset
()
logs
.
Reset
()
for
adaptor
,
config
:=
range
BConfig
.
Log
.
Outputs
{
err
=
BeeLogger
.
SetLogger
(
adaptor
,
config
)
err
=
logs
.
SetLogger
(
adaptor
,
config
)
if
err
!=
nil
{
fmt
.
Printf
(
"%s with the config `%s` got err:%s
\n
"
,
adaptor
,
config
,
err
)
}
}
SetLogFuncCall
(
BConfig
.
Log
.
FileLineNum
)
logs
.
SetLogFuncCall
(
BConfig
.
Log
.
FileLineNum
)
return
nil
}
...
...
hooks.go
View file @
98dfecfd
...
...
@@ -7,6 +7,7 @@ import (
"path/filepath"
"github.com/astaxie/beego/context"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/session"
)
...
...
@@ -71,7 +72,7 @@ func registerSession() error {
func
registerTemplate
()
error
{
if
err
:=
BuildTemplate
(
BConfig
.
WebConfig
.
ViewsPath
);
err
!=
nil
{
if
BConfig
.
RunMode
==
DEV
{
Warn
(
err
)
logs
.
Warn
(
err
)
}
return
err
}
...
...
log.go
deleted
100644 → 0
View file @
03840f3f
// Copyright 2014 beego Author. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package
beego
import
(
"strings"
"github.com/astaxie/beego/logs"
)
// Log levels to control the logging output.
const
(
LevelEmergency
=
iota
LevelAlert
LevelCritical
LevelError
LevelWarning
LevelNotice
LevelInformational
LevelDebug
)
// BeeLogger references the used application logger.
var
BeeLogger
=
logs
.
NewLogger
(
100
)
// SetLevel sets the global log level used by the simple logger.
func
SetLevel
(
l
int
)
{
BeeLogger
.
SetLevel
(
l
)
}
// SetLogFuncCall set the CallDepth, default is 3
func
SetLogFuncCall
(
b
bool
)
{
BeeLogger
.
EnableFuncCallDepth
(
b
)
BeeLogger
.
SetLogFuncCallDepth
(
3
)
}
// SetLogger sets a new logger.
func
SetLogger
(
adaptername
string
,
config
string
)
error
{
err
:=
BeeLogger
.
SetLogger
(
adaptername
,
config
)
if
err
!=
nil
{
return
err
}
return
nil
}
// Emergency logs a message at emergency level.
func
Emergency
(
v
...
interface
{})
{
BeeLogger
.
Emergency
(
generateFmtStr
(
len
(
v
)),
v
...
)
}
// Alert logs a message at alert level.
func
Alert
(
v
...
interface
{})
{
BeeLogger
.
Alert
(
generateFmtStr
(
len
(
v
)),
v
...
)
}
// Critical logs a message at critical level.
func
Critical
(
v
...
interface
{})
{
BeeLogger
.
Critical
(
generateFmtStr
(
len
(
v
)),
v
...
)
}
// Error logs a message at error level.
func
Error
(
v
...
interface
{})
{
BeeLogger
.
Error
(
generateFmtStr
(
len
(
v
)),
v
...
)
}
// Warning logs a message at warning level.
func
Warning
(
v
...
interface
{})
{
BeeLogger
.
Warning
(
generateFmtStr
(
len
(
v
)),
v
...
)
}
// Warn compatibility alias for Warning()
func
Warn
(
v
...
interface
{})
{
BeeLogger
.
Warn
(
generateFmtStr
(
len
(
v
)),
v
...
)
}
// Notice logs a message at notice level.
func
Notice
(
v
...
interface
{})
{
BeeLogger
.
Notice
(
generateFmtStr
(
len
(
v
)),
v
...
)
}
// Informational logs a message at info level.
func
Informational
(
v
...
interface
{})
{
BeeLogger
.
Informational
(
generateFmtStr
(
len
(
v
)),
v
...
)
}
// Info compatibility alias for Warning()
func
Info
(
v
...
interface
{})
{
BeeLogger
.
Info
(
generateFmtStr
(
len
(
v
)),
v
...
)
}
// Debug logs a message at debug level.
func
Debug
(
v
...
interface
{})
{
BeeLogger
.
Debug
(
generateFmtStr
(
len
(
v
)),
v
...
)
}
// Trace logs a message at trace level.
// compatibility alias for Warning()
func
Trace
(
v
...
interface
{})
{
BeeLogger
.
Trace
(
generateFmtStr
(
len
(
v
)),
v
...
)
}
func
generateFmtStr
(
n
int
)
string
{
return
strings
.
Repeat
(
"%v "
,
n
)
}
parser.go
View file @
98dfecfd
...
...
@@ -27,6 +27,7 @@ import (
"sort"
"strings"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/utils"
)
...
...
@@ -58,7 +59,7 @@ func parserPkg(pkgRealpath, pkgpath string) error {
rep
:=
strings
.
NewReplacer
(
"/"
,
"_"
,
"."
,
"_"
)
commentFilename
=
coomentPrefix
+
rep
.
Replace
(
pkgpath
)
+
".go"
if
!
compareFile
(
pkgRealpath
)
{
Info
(
pkgRealpath
+
" no changed"
)
logs
.
Info
(
pkgRealpath
+
" no changed"
)
return
nil
}
genInfoList
=
make
(
map
[
string
][]
ControllerComments
)
...
...
@@ -131,7 +132,7 @@ func parserComments(comments *ast.CommentGroup, funcName, controllerName, pkgpat
func
genRouterCode
()
{
os
.
Mkdir
(
path
.
Join
(
AppPath
,
"routers"
),
0755
)
Info
(
"generate router from comments"
)
logs
.
Info
(
"generate router from comments"
)
var
(
globalinfo
string
sortKey
[]
string
...
...
router.go
View file @
98dfecfd
...
...
@@ -28,6 +28,7 @@ import (
"time"
beecontext
"github.com/astaxie/beego/context"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/toolbox"
"github.com/astaxie/beego/utils"
)
...
...
@@ -439,11 +440,11 @@ func (p *ControllerRegister) insertFilterRouter(pos int, mr *FilterRouter) (err
func
(
p
*
ControllerRegister
)
URLFor
(
endpoint
string
,
values
...
interface
{})
string
{
paths
:=
strings
.
Split
(
endpoint
,
"."
)
if
len
(
paths
)
<=
1
{
Warn
(
"urlfor endpoint must like path.controller.method"
)
logs
.
Warn
(
"urlfor endpoint must like path.controller.method"
)
return
""
}
if
len
(
values
)
%
2
!=
0
{
Warn
(
"urlfor params must key-value pair"
)
logs
.
Warn
(
"urlfor params must key-value pair"
)
return
""
}
params
:=
make
(
map
[
string
]
string
)
...
...
@@ -651,7 +652,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request)
var
err
error
context
.
Input
.
CruSession
,
err
=
GlobalSessions
.
SessionStart
(
rw
,
r
)
if
err
!=
nil
{
Error
(
err
)
logs
.
Error
(
err
)
exception
(
"503"
,
context
)
goto
Admin
}
...
...
@@ -780,7 +781,7 @@ func (p *ControllerRegister) ServeHTTP(rw http.ResponseWriter, r *http.Request)
if
!
context
.
ResponseWriter
.
Started
&&
context
.
Output
.
Status
==
0
{
if
BConfig
.
WebConfig
.
AutoRender
{
if
err
:=
execController
.
Render
();
err
!=
nil
{
Error
(
err
)
logs
.
Error
(
err
)
}
}
}
...
...
@@ -825,7 +826,7 @@ Admin:
devInfo
=
fmt
.
Sprintf
(
"| % -10s | % -40s | % -16s | % -10s |"
,
r
.
Method
,
r
.
URL
.
Path
,
timeDur
.
String
(),
"notmatch"
)
}
if
DefaultAccessLogFilter
==
nil
||
!
DefaultAccessLogFilter
.
Filter
(
context
)
{
Debug
(
devInfo
)
logs
.
Debug
(
devInfo
)
}
}
...
...
@@ -850,14 +851,14 @@ func (p *ControllerRegister) recoverPanic(context *beecontext.Context) {
}
}
var
stack
string
Critical
(
"the request url is "
,
context
.
Input
.
URL
())
Critical
(
"Handler crashed with error"
,
err
)
logs
.
Critical
(
"the request url is "
,
context
.
Input
.
URL
())
logs
.
Critical
(
"Handler crashed with error"
,
err
)
for
i
:=
1
;
;
i
++
{
_
,
file
,
line
,
ok
:=
runtime
.
Caller
(
i
)
if
!
ok
{
break
}
Critical
(
fmt
.
Sprintf
(
"%s:%d"
,
file
,
line
))
logs
.
Critical
(
fmt
.
Sprintf
(
"%s:%d"
,
file
,
line
))
stack
=
stack
+
fmt
.
Sprintln
(
fmt
.
Sprintf
(
"%s:%d"
,
file
,
line
))
}
if
BConfig
.
RunMode
==
DEV
{
...
...
staticfile.go
View file @
98dfecfd
...
...
@@ -27,6 +27,7 @@ import (
"time"
"github.com/astaxie/beego/context"
"github.com/astaxie/beego/logs"
)
var
errNotStaticRequest
=
errors
.
New
(
"request not a static file request"
)
...
...
@@ -48,7 +49,7 @@ func serverStaticRouter(ctx *context.Context) {
if
filePath
==
""
||
fileInfo
==
nil
{
if
BConfig
.
RunMode
==
DEV
{
Warn
(
"Can't find/open the file:"
,
filePath
,
err
)
logs
.
Warn
(
"Can't find/open the file:"
,
filePath
,
err
)
}
http
.
NotFound
(
ctx
.
ResponseWriter
,
ctx
.
Request
)
return
...
...
@@ -72,7 +73,7 @@ func serverStaticRouter(ctx *context.Context) {
b
,
n
,
sch
,
err
:=
openFile
(
filePath
,
fileInfo
,
acceptEncoding
)
if
err
!=
nil
{
if
BConfig
.
RunMode
==
DEV
{
Warn
(
"Can't compress the file:"
,
filePath
,
err
)
logs
.
Warn
(
"Can't compress the file:"
,
filePath
,
err
)
}
http
.
NotFound
(
ctx
.
ResponseWriter
,
ctx
.
Request
)
return
...
...
template.go
View file @
98dfecfd
...
...
@@ -26,6 +26,7 @@ import (
"strings"
"sync"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/utils"
)
...
...
@@ -46,7 +47,7 @@ func executeTemplate(wr io.Writer, name string, data interface{}) error {
if
t
,
ok
:=
beeTemplates
[
name
];
ok
{
err
:=
t
.
ExecuteTemplate
(
wr
,
name
,
data
)
if
err
!=
nil
{
Trace
(
"template Execute err:"
,
err
)
logs
.
Trace
(
"template Execute err:"
,
err
)
}
return
err
}
...
...
@@ -162,7 +163,7 @@ func BuildTemplate(dir string, files ...string) error {
templatesLock
.
Lock
()
t
,
err
:=
getTemplate
(
self
.
root
,
file
,
v
...
)
if
err
!=
nil
{
Trace
(
"parse template err:"
,
file
,
err
)
logs
.
Trace
(
"parse template err:"
,
file
,
err
)
}
else
{
beeTemplates
[
file
]
=
t
}
...
...
@@ -240,7 +241,7 @@ func _getTemplate(t0 *template.Template, root string, subMods [][]string, others
var
subMods1
[][]
string
t
,
subMods1
,
err
=
getTplDeep
(
root
,
otherFile
,
""
,
t
)
if
err
!=
nil
{
Trace
(
"template parse file err:"
,
err
)
logs
.
Trace
(
"template parse file err:"
,
err
)
}
else
if
subMods1
!=
nil
&&
len
(
subMods1
)
>
0
{
t
,
err
=
_getTemplate
(
t
,
root
,
subMods1
,
others
...
)
}
...
...
@@ -261,7 +262,7 @@ func _getTemplate(t0 *template.Template, root string, subMods [][]string, others
var
subMods1
[][]
string
t
,
subMods1
,
err
=
getTplDeep
(
root
,
otherFile
,
""
,
t
)
if
err
!=
nil
{
Trace
(
"template parse file err:"
,
err
)
logs
.
Trace
(
"template parse file err:"
,
err
)
}
else
if
subMods1
!=
nil
&&
len
(
subMods1
)
>
0
{
t
,
err
=
_getTemplate
(
t
,
root
,
subMods1
,
others
...
)
}
...
...
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