Skip to content

Commit cce0022

Browse files
veezhangveezhang
authored
adjustment log (#53)
1 parent 662da6b commit cce0022

File tree

8 files changed

+57
-30
lines changed

8 files changed

+57
-30
lines changed

‎common/runtime.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package common
22

33
import (
4-
"log"
54
"net/http"
65
"runtime"
6+
7+
"github.com/astaxie/beego/logs"
78
)
89

910
func LogPanic(r interface{}) {
@@ -17,8 +18,8 @@ func LogPanic(r interface{}) {
1718
stacktrace := make([]byte, size)
1819
stacktrace = stacktrace[:runtime.Stack(stacktrace, false)]
1920
if _, ok := r.(string); ok {
20-
log.Printf("Observed a panic: %s\n%s", r, stacktrace)
21+
logs.Warn("Observed a panic: %s\n%s", r, stacktrace)
2122
} else {
22-
log.Printf("Observed a panic: %#v (%v)\n%s", r, r, stacktrace)
23+
logs.Warn("Observed a panic: %#v (%v)\n%s", r, r, stacktrace)
2324
}
2425
}

‎conf/app.conf

+1
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,6 @@ runmode = dev
55
autorender = false
66
copyrequestbody = true
77
logspath = "./logs/"
8+
loglevel = "info"
89
uploadspath = "./uploads/"
910
sqlitedbfilepath = "./tasks.db"

‎controllers/task.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"fmt"
66

77
"github.com/astaxie/beego"
8+
"github.com/astaxie/beego/logs"
89
"github.com/vesoft-inc/nebula-http-gateway/service/importer"
910
"github.com/vesoft-inc/nebula-importer/pkg/config"
1011

@@ -47,7 +48,7 @@ func (this *TaskController) Import() {
4748
if err != nil {
4849
// task err: import task not start err handle
4950
task.TaskStatus = importer.StatusAborted.String()
50-
beego.Error(fmt.Sprintf("Failed to start a import task: `%s`, task result: `%v`", taskID, err))
51+
logs.Error(fmt.Sprintf("Failed to start a import task: `%s`, task result: `%v`", taskID, err))
5152

5253
res.Code = -1
5354
res.Message = err.Error()

‎main.go

+33-11
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"syscall"
1111
"time"
1212

13+
"github.com/astaxie/beego/logs"
1314
_ "github.com/vesoft-inc/nebula-http-gateway/routers"
1415

1516
"github.com/astaxie/beego"
@@ -29,24 +30,45 @@ func main() {
2930
/*
3031
logger config
3132
*/
32-
logsPath := beego.AppConfig.String("logspath")
33+
logsPath := beego.AppConfig.DefaultString("logspath", "./logs/")
3334
absLogsPath, _ := filepath.Abs(logsPath)
3435
_, err := common.CreateFileWithPerm(absLogsPath+"/", "0720")
3536

3637
if err != nil && os.IsNotExist(err) {
3738
log.Fatalf("create file %s with error: %s", absLogsPath, err.Error())
3839
}
3940

41+
logFileName := beego.AppConfig.DefaultString("appname", "nebula-http-gateway")
42+
logFileName += ".log"
43+
4044
logFilePath := filepath.Join(
4145
absLogsPath,
42-
"test.log",
46+
logFileName,
4347
)
44-
beego.SetLogger("file", fmt.Sprintf(`{"filename":"%s","MaxSize":104857600,"perm":"0620"}`, logFilePath))
45-
beego.BeeLogger.DelLogger("console")
46-
beego.SetLogFuncCall(true)
47-
beego.BeeLogger.SetLogFuncCallDepth(3)
48-
// beego.SetLevel(beego.LevelInformational)
49-
beego.SetLevel(beego.LevelDebug)
48+
49+
logLevelString := beego.AppConfig.String("logLevel")
50+
logLevel := logs.LevelWarning
51+
switch logLevelString {
52+
case "error":
53+
logLevel = logs.LevelError
54+
case "warning", "warn":
55+
logLevel = logs.LevelWarning
56+
case "notice":
57+
logLevel = logs.LevelNotice
58+
case "informational", "info":
59+
logLevel = logs.LevelInformational
60+
case "debug":
61+
logLevel = logs.LevelDebug
62+
}
63+
64+
logs.SetLogger("file", fmt.Sprintf(`{"filename":"%s","MaxSize":104857600,"perm":"0620"}`, logFilePath))
65+
logs.GetBeeLogger().DelLogger("console")
66+
logs.SetLogFuncCall(true)
67+
logs.SetLogFuncCallDepth(3)
68+
logs.SetLevel(logLevel)
69+
defer func(){
70+
logs.GetBeeLogger().Flush()
71+
}()
5072

5173
/*
5274
importer file uploads config
@@ -69,14 +91,14 @@ func main() {
6991
go func() {
7092
<-quit
7193

72-
beego.Info("server is shutting down")
94+
logs.Info("server is shutting down")
7395

7496
ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
7597
defer cancel()
7698

7799
beego.BeeApp.Server.SetKeepAlivesEnabled(false)
78100
if err := beego.BeeApp.Server.Shutdown(ctx); err != nil {
79-
beego.Error(err.Error())
101+
logs.Error(err.Error())
80102
}
81103

82104
close(done)
@@ -85,5 +107,5 @@ func main() {
85107
beego.Run()
86108

87109
<-done
88-
beego.Info("server closed")
110+
logs.Info("server closed")
89111
}

‎service/dao/dao.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package dao
22

33
import (
44
"errors"
5-
"log"
65

6+
"github.com/astaxie/beego/logs"
77
"github.com/vesoft-inc/nebula-http-gateway/common"
88
"github.com/vesoft-inc/nebula-http-gateway/service/pool"
99

@@ -328,7 +328,7 @@ func Execute(nsid string, gql string) (result ExecuteResult, err error) {
328328
}
329329

330330
if !resp.IsSucceed() {
331-
log.Printf("ErrorCode: %v, ErrorMsg: %s", resp.GetErrorCode(), resp.GetErrorMsg())
331+
logs.Info("ErrorCode: %v, ErrorMsg: %s", resp.GetErrorCode(), resp.GetErrorMsg())
332332
return result, errors.New(string(resp.GetErrorMsg()))
333333
}
334334
if !resp.IsEmpty() {

‎service/importer/importer.go

+7-6
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import (
77
"time"
88

99
"github.com/astaxie/beego"
10+
"github.com/astaxie/beego/logs"
1011
"github.com/vesoft-inc/nebula-importer/pkg/config"
1112
importerErrors "github.com/vesoft-inc/nebula-importer/pkg/errors"
1213
)
@@ -28,7 +29,7 @@ type ActionResult struct {
2829

2930
func Import(taskID string, configPath string, configBody *config.YAMLConfig) (err error) {
3031

31-
beego.Debug(fmt.Sprintf("Start a import task: `%s`", taskID))
32+
logs.Debug(fmt.Sprintf("Start a import task: `%s`", taskID))
3233

3334
var conf *config.YAMLConfig
3435

@@ -41,7 +42,7 @@ func Import(taskID string, configPath string, configBody *config.YAMLConfig) (er
4142
)
4243

4344
if err != nil {
44-
beego.Error(err.(importerErrors.ImporterError))
45+
logs.Error(err.(importerErrors.ImporterError))
4546
return err.(importerErrors.ImporterError)
4647
}
4748
} else {
@@ -73,21 +74,21 @@ func Import(taskID string, configPath string, configBody *config.YAMLConfig) (er
7374
result.ErrorResult.ErrorCode = err.ErrCode
7475
result.ErrorResult.ErrorMsg = err.ErrMsg.Error()
7576

76-
beego.Error(fmt.Sprintf("Failed to finish a import task: `%s`, task result: `%v`", taskID, result))
77+
logs.Error(fmt.Sprintf("Failed to finish a import task: `%s`, task result: `%v`", taskID, result))
7778
} else {
7879
task.TaskStatus = StatusFinished.String()
7980

8081
result.FailedRows = task.GetRunner().NumFailed
8182
GetTaskMgr().DelTask(taskID)
8283

83-
beego.Debug(fmt.Sprintf("Success to finish a import task: `%s`, task result: `%v`", taskID, result))
84+
logs.Debug(fmt.Sprintf("Success to finish a import task: `%s`, task result: `%v`", taskID, result))
8485
}
8586
}()
8687
return nil
8788
}
8889

8990
func ImportAction(taskID string, taskAction TaskAction) (result ActionResult, err error) {
90-
beego.Debug(fmt.Sprintf("Start a import task action: `%s` for task: `%s`", taskAction.String(), taskID))
91+
logs.Debug(fmt.Sprintf("Start a import task action: `%s` for task: `%s`", taskAction.String(), taskID))
9192

9293
result = ActionResult{}
9394

@@ -104,7 +105,7 @@ func ImportAction(taskID string, taskAction TaskAction) (result ActionResult, er
104105
err = errors.New("unknown task action")
105106
}
106107

107-
beego.Debug(fmt.Sprintf("The import task action: `%s` for task: `%s` finished, action result: `%v`", taskAction.String(), taskID, result))
108+
logs.Debug(fmt.Sprintf("The import task action: `%s` for task: `%s` finished, action result: `%v`", taskAction.String(), taskID, result))
108109

109110
return result, err
110111
}

‎service/importer/taskmgr.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"sync"
1010

1111
"github.com/astaxie/beego"
12+
"github.com/astaxie/beego/logs"
1213
_ "github.com/mattn/go-sqlite3"
1314
"github.com/vesoft-inc/nebula-importer/pkg/cmd"
1415
)
@@ -154,7 +155,7 @@ func initDB() {
154155
_db, err := sql.Open("sqlite3", dbFilePath)
155156

156157
if err != nil {
157-
beego.Emergency(err.Error())
158+
logs.Emergency(err.Error())
158159
log.Panic(err)
159160
}
160161

@@ -167,7 +168,7 @@ func initDB() {
167168
_, err = GetTaskMgr().db.Exec(sqlStmt)
168169

169170
if err != nil {
170-
beego.Emergency(fmt.Sprintf("%q: %s\n", err, sqlStmt))
171+
logs.Emergency(fmt.Sprintf("%q: %s\n", err, sqlStmt))
171172
log.Panicf("%q: %s\n", err, sqlStmt)
172173
}
173174

‎service/logger/adapter.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ package logger
33
import (
44
"fmt"
55

6-
"github.com/astaxie/beego"
6+
"github.com/astaxie/beego/logs"
77
)
88

99
type HttpGatewayLogger struct{}
1010

1111
func (l HttpGatewayLogger) Info(msg string) {
12-
beego.Info(fmt.Sprintf("[nebula-clients] %s", msg))
12+
logs.Info(fmt.Sprintf("[nebula-clients] %s", msg))
1313
}
1414

1515
func (l HttpGatewayLogger) Warn(msg string) {
16-
beego.Warn(fmt.Sprintf("[nebula-clients] %s", msg))
16+
logs.Warn(fmt.Sprintf("[nebula-clients] %s", msg))
1717
}
1818

1919
func (l HttpGatewayLogger) Error(msg string) {
20-
beego.Error(fmt.Sprintf("[nebula-clients] %s", msg))
20+
logs.Error(fmt.Sprintf("[nebula-clients] %s", msg))
2121
}
2222

2323
func (l HttpGatewayLogger) Fatal(msg string) {
24-
beego.Emergency(fmt.Sprintf("[nebula-clients] %s", msg))
24+
logs.Emergency(fmt.Sprintf("[nebula-clients] %s", msg))
2525
}

0 commit comments

Comments
 (0)