lbsadmin/bee
1
0
Fork 0
mirror of https://github.com/beego/bee.git synced 2024-11-25 15:00:55 +00:00
Code Issues Releases Activity

Fixes the filename and lineNo in debug log message

Browse Source
This commit is contained in:
Faissal Elamraoui 2016-11-14 18:02:29 +01:00 committed by Faissal Elamraoui
parent c3c264ddb5
commit deacdaa667
9 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apiapp.go
View File

@ -658,7 +658,7 @@ func checkEnv(appname string) (apppath, packpath string, err error) {
gopath := gps[0]
logger.Warn("You current workdir is not inside $GOPATH/src")
logger.Debugf("GOPATH: %s", gopath)
logger.Debugf("GOPATH: %s", __FILE__(), __LINE__(), gopath)
gosrcpath := path.Join(gopath, "src")
apppath = path.Join(gosrcpath, appname)

2
g.go
View File

@ -91,7 +91,7 @@ func generateCode(cmd *Command, args []string) int {
gopath := gps[0]
logger.Debugf("GOPATH: %s", gopath)
logger.Debugf("GOPATH: %s", __FILE__(), __LINE__(), gopath)
gcmd := args[0]
switch gcmd {

2
g_appcode.go
View File

@ -954,7 +954,7 @@ func getPackagePath(curpath string) (packpath string) {
logger.Fatal("GOPATH environment variable is not set or empty")
}
logger.Debugf("GOPATH: %s", gopath)
logger.Debugf("GOPATH: %s", __FILE__(), __LINE__(), gopath)
appsrcpath := ""
haspath := false

15
logger.go
View File

@ -19,7 +19,6 @@ import (
"io"
"os"
"path/filepath"
"runtime"
"sync"
"sync/atomic"
"text/template"
@ -155,7 +154,7 @@ func (l *BeeLogger) mustLog(level int, message string, args ...interface{}) {
// mustLogDebug logs a debug message only if debug mode
// is enabled. i.e. DEBUG_ENABLED="1"
func (l *BeeLogger) mustLogDebug(message string, args ...interface{}) {
func (l *BeeLogger) mustLogDebug(message string, file string, line int, args ...interface{}) {
if !IsDebugEnabled() {
return
}
@ -163,9 +162,7 @@ func (l *BeeLogger) mustLogDebug(message string, args ...interface{}) {
// Change the output to Stderr
l.SetOutput(os.Stderr)
// Create the log record and Get the filename
// and the line number of the caller
_, file, line, _ := runtime.Caller(1)
// Create the log record
record := LogRecord{
ID: fmt.Sprintf("%04d", atomic.AddUint64(&sequenceNo, 1)),
Level: l.getColorLevel(levelDebug),
@ -178,13 +175,13 @@ func (l *BeeLogger) mustLogDebug(message string, args ...interface{}) {
}
// Debug outputs a debug log message
func (l *BeeLogger) Debug(message string) {
l.mustLogDebug(message)
func (l *BeeLogger) Debug(message string, file string, line int) {
l.mustLogDebug(message, file, line)
}
// Debugf outputs a formatted debug log message
func (l *BeeLogger) Debugf(message string, vars ...interface{}) {
l.mustLogDebug(message, vars...)
func (l *BeeLogger) Debugf(message string, file string, line int, vars ...interface{}) {
l.mustLogDebug(message, file, line, vars...)
}
// Info outputs an information log message

2
migrate.go
View File

@ -73,7 +73,7 @@ func runMigration(cmd *Command, args []string) int {
gopath := gps[0]
logger.Debugf("GOPATH: %s", gopath)
logger.Debugf("GOPATH: %s", __FILE__(), __LINE__(), gopath)
// Load the configuration
err := loadConfig()

2
run.go
View File

@ -99,7 +99,7 @@ func runApp(cmd *Command, args []string) int {
logger.Infof("Using '%s' as 'appname'", appname)
logger.Debugf("Current path: %s", currpath)
logger.Debugf("Current path: %s", __FILE__(), __LINE__(), currpath)
if runmode == "prod" || runmode == "dev" {
os.Setenv("BEEGO_RUNMODE", runmode)

2
test.go
View File

@ -56,7 +56,7 @@ func testApp(cmd *Command, args []string) int {
currpath, _ := os.Getwd()
logger.Debugf("Current path: %s", currpath)
logger.Debugf("Current path: %s", __FILE__(), __LINE__(), currpath)
err := loadConfig()
if err != nil {

12
util.go
View File

@ -262,3 +262,15 @@ func IsDebugEnabled() bool {
debugMode := os.Getenv("DEBUG_ENABLED")
return map[string]bool{"1": true, "0": false}[debugMode]
}
// __FILE__ returns the file name in which the function was invoked
func __FILE__() string {
_, file, _, _ := runtime.Caller(1)
return file
}
// __LINE__ returns the line number at which the function was invoked
func __LINE__() int {
_, _, line, _ := runtime.Caller(1)
return line
}

5
watch.go
View File

@ -16,7 +16,6 @@ package main
import (
"bytes"
"github.com/howeyc/fsnotify"
"os"
"os/exec"
"regexp"
@ -24,6 +23,8 @@ import (
"strings"
"sync"
"time"
"github.com/howeyc/fsnotify"
)
var (
@ -209,7 +210,7 @@ func Kill() {
// Restart kills the running command process and starts it again
func Restart(appname string) {
logger.Debugf("Kill running process")
logger.Debugf("Kill running process", __FILE__(), __LINE__())
Kill()
go Start(appname)
}