Commit 101bbdea authored by szh's avatar szh

配置文件Modeul Log大写

parent 4b45bdc0
...@@ -21,24 +21,24 @@ TimeFormat = 20060102 ...@@ -21,24 +21,24 @@ TimeFormat = 20060102
[log] [log]
# 日志级别,支持debug(dbug)/info/warn/error(eror)/crit # 日志级别,支持debug(dbug)/info/warn/error(eror)/crit
loglevel = "debug" Loglevel = "debug"
logConsoleLevel = "info" LogConsoleLevel = "info"
# 日志文件名,可带目录,所有生成的日志文件都放到此目录下 # 日志文件名,可带目录,所有生成的日志文件都放到此目录下
logFile = "logs/chain33-pai.log" LogFile = "logs/chain33-pai.log"
# 单个日志文件的最大值(单位:兆) # 单个日志文件的最大值(单位:兆)
maxFileSize = 100 MaxFileSize = 100
# 最多保存的历史日志文件个数 # 最多保存的历史日志文件个数
maxBackups = 10 MaxBackups = 10
# 最多保存的历史日志消息(单位:天) # 最多保存的历史日志消息(单位:天)
maxAge = 10 MaxAge = 10
# 日志文件名是否使用本地事件(否则使用UTC时间)l # 日志文件名是否使用本地事件(否则使用UTC时间)l
localTime = true LocalTime = true
# 历史日志文件是否压缩(压缩格式为gz) # 历史日志文件是否压缩(压缩格式为gz)
compress = true Compress = true
# 是否打印调用源文件和行号 # 是否打印调用源文件和行号
callerFile = false CallerFile = false
# 是否打印调用方法 # 是否打印调用方法
callerFunction = false CallerFunction = false
[server] [server]
#debug or release #debug or release
......
...@@ -51,7 +51,7 @@ func main() { ...@@ -51,7 +51,7 @@ func main() {
MaxHeaderBytes: maxHeaderBytes, MaxHeaderBytes: maxHeaderBytes,
} }
tlog.Info("[info] start http server listening %s", endPoint) tlog.Info("[info] start http server listening ", "port",endPoint)
server.ListenAndServe() server.ListenAndServe()
select {} select {}
...@@ -96,7 +96,7 @@ func broadcast() { ...@@ -96,7 +96,7 @@ func broadcast() {
} }
conn, err := net.DialUDP("udp", &laddr, &raddr) conn, err := net.DialUDP("udp", &laddr, &raddr)
if err != nil { if err != nil {
tlog.Error("broadcast",err) tlog.Error("broadcast","net error ",err)
} }
for { for {
...@@ -104,7 +104,7 @@ func broadcast() { ...@@ -104,7 +104,7 @@ func broadcast() {
if err != nil{ if err != nil{
panic(err) panic(err)
} }
tlog.Info("broadcast",send) tlog.Info("broadcast","udp",send)
time.Sleep(time.Second*5) time.Sleep(time.Second*5)
} }
} }
\ No newline at end of file
...@@ -32,14 +32,14 @@ func ResetWallet(c *gin.Context) { ...@@ -32,14 +32,14 @@ func ResetWallet(c *gin.Context) {
err:=cmd.Start() err:=cmd.Start()
if err!=nil{ if err!=nil{
appG.Response(http.StatusOK, e.ENV_ERROR, "fail to reset wallet") appG.Response(http.StatusOK, e.ENV_ERROR, "fail to reset wallet")
tlog.Error("ResetWallet",err) tlog.Error("ResetWallet","kill error ",err)
app.BityuanFlag = false app.BityuanFlag = false
return return
} }
err=os.RemoveAll(fmt.Sprintf("%s/wallet",path.Dir(app.Bityuan.Path))) err=os.RemoveAll(fmt.Sprintf("%s/wallet",path.Dir(app.Bityuan.Path)))
if err!=nil{ if err!=nil{
appG.Response(http.StatusOK, e.NODE_ERROR, "fail to remove wallet") appG.Response(http.StatusOK, e.NODE_ERROR, "fail to remove wallet")
tlog.Error("ResetWallet",err) tlog.Error("ResetWallet","remove error",err)
app.BityuanFlag = false app.BityuanFlag = false
return return
} }
...@@ -47,7 +47,7 @@ func ResetWallet(c *gin.Context) { ...@@ -47,7 +47,7 @@ func ResetWallet(c *gin.Context) {
err=app.StartProcess(setting.Chain33Pai.Auto) err=app.StartProcess(setting.Chain33Pai.Auto)
if err!=nil{ if err!=nil{
appG.Response(http.StatusOK, e.NODE_ERROR,"fail to restart node") appG.Response(http.StatusOK, e.NODE_ERROR,"fail to restart node")
tlog.Error("ResetWallet",err) tlog.Error("ResetWallet","auto.sh error ",err)
app.BityuanFlag = false app.BityuanFlag = false
return return
} }
...@@ -112,7 +112,7 @@ func UpdateNode(c *gin.Context){ ...@@ -112,7 +112,7 @@ func UpdateNode(c *gin.Context){
tar := exec.Command("tar","-xvf",name) tar := exec.Command("tar","-xvf",name)
err = tar.Start() err = tar.Start()
if err != nil { if err != nil {
tlog.Error("tar",err) tlog.Error("tar","err",err)
appG.Response(http.StatusOK, e.TAR_XVF_ERROR, err) appG.Response(http.StatusOK, e.TAR_XVF_ERROR, err)
app.UpdateInfo.Flag = true app.UpdateInfo.Flag = true
app.BityuanFlag = false app.BityuanFlag = false
...@@ -120,7 +120,7 @@ func UpdateNode(c *gin.Context){ ...@@ -120,7 +120,7 @@ func UpdateNode(c *gin.Context){
} }
err = tar.Wait() err = tar.Wait()
if err != nil { if err != nil {
tlog.Error("tar",err) tlog.Error("tar","err",err)
appG.Response(http.StatusOK, e.TAR_XVF_ERROR, err) appG.Response(http.StatusOK, e.TAR_XVF_ERROR, err)
app.UpdateInfo.Flag = true app.UpdateInfo.Flag = true
app.BityuanFlag = false app.BityuanFlag = false
...@@ -130,7 +130,7 @@ func UpdateNode(c *gin.Context){ ...@@ -130,7 +130,7 @@ func UpdateNode(c *gin.Context){
bak := exec.Command("cp",absPath+setting.BityuanSetting.Name,absPath+setting.BityuanSetting.Name+".bak") bak := exec.Command("cp",absPath+setting.BityuanSetting.Name,absPath+setting.BityuanSetting.Name+".bak")
err = bak.Start() err = bak.Start()
if err != nil { if err != nil {
tlog.Error("bak",err) tlog.Error("bak","err",err)
appG.Response(http.StatusOK, e.CP_ERROR, err) appG.Response(http.StatusOK, e.CP_ERROR, err)
app.UpdateInfo.Flag = true app.UpdateInfo.Flag = true
app.BityuanFlag = false app.BityuanFlag = false
...@@ -138,7 +138,7 @@ func UpdateNode(c *gin.Context){ ...@@ -138,7 +138,7 @@ func UpdateNode(c *gin.Context){
} }
err = bak.Wait() err = bak.Wait()
if err != nil { if err != nil {
tlog.Error("bak",err) tlog.Error("bak","err",err)
appG.Response(http.StatusOK, e.CP_ERROR, err) appG.Response(http.StatusOK, e.CP_ERROR, err)
app.UpdateInfo.Flag = true app.UpdateInfo.Flag = true
app.BityuanFlag = false app.BityuanFlag = false
...@@ -148,7 +148,7 @@ func UpdateNode(c *gin.Context){ ...@@ -148,7 +148,7 @@ func UpdateNode(c *gin.Context){
bakconf := exec.Command("cp",absPath+"bityuan.toml",absPath+"bityuan.toml.bak") bakconf := exec.Command("cp",absPath+"bityuan.toml",absPath+"bityuan.toml.bak")
err = bakconf.Start() err = bakconf.Start()
if err != nil { if err != nil {
tlog.Error("bakconf",err) tlog.Error("bakconf","err",err)
appG.Response(http.StatusOK, e.CP_ERROR, err) appG.Response(http.StatusOK, e.CP_ERROR, err)
app.UpdateInfo.Flag = true app.UpdateInfo.Flag = true
app.BityuanFlag = false app.BityuanFlag = false
...@@ -156,7 +156,7 @@ func UpdateNode(c *gin.Context){ ...@@ -156,7 +156,7 @@ func UpdateNode(c *gin.Context){
} }
err = bakconf.Wait() err = bakconf.Wait()
if err != nil { if err != nil {
tlog.Error("bakconf",err) tlog.Error("bakconf","err",err)
appG.Response(http.StatusOK, e.CP_ERROR, err) appG.Response(http.StatusOK, e.CP_ERROR, err)
app.UpdateInfo.Flag = true app.UpdateInfo.Flag = true
app.BityuanFlag = false app.BityuanFlag = false
...@@ -191,7 +191,7 @@ func UpdateNode(c *gin.Context){ ...@@ -191,7 +191,7 @@ func UpdateNode(c *gin.Context){
mv.Stderr = mverr mv.Stderr = mverr
err = mv.Start() err = mv.Start()
if err != nil { if err != nil {
tlog.Error("mv",err) tlog.Error("mv","err",err)
appG.Response(http.StatusOK, e.MV_ERROR, err) appG.Response(http.StatusOK, e.MV_ERROR, err)
app.UpdateInfo.Flag = true app.UpdateInfo.Flag = true
app.BityuanFlag = false app.BityuanFlag = false
...@@ -199,7 +199,7 @@ func UpdateNode(c *gin.Context){ ...@@ -199,7 +199,7 @@ func UpdateNode(c *gin.Context){
} }
err = mv.Wait() err = mv.Wait()
if err != nil { if err != nil {
tlog.Error("stderr:",mverr.String()) tlog.Error("stderr:","err",mverr.String())
appG.Response(http.StatusOK, e.MV_ERROR, mverr.String()) appG.Response(http.StatusOK, e.MV_ERROR, mverr.String())
app.UpdateInfo.Flag = true app.UpdateInfo.Flag = true
app.BityuanFlag = false app.BityuanFlag = false
...@@ -210,7 +210,7 @@ func UpdateNode(c *gin.Context){ ...@@ -210,7 +210,7 @@ func UpdateNode(c *gin.Context){
mv2.Stderr = mverr2 mv2.Stderr = mverr2
err = mv2.Start() err = mv2.Start()
if err != nil { if err != nil {
tlog.Error("mv2",err) tlog.Error("mv2","err",err)
appG.Response(http.StatusOK, e.MV_ERROR, err) appG.Response(http.StatusOK, e.MV_ERROR, err)
app.UpdateInfo.Flag = true app.UpdateInfo.Flag = true
app.BityuanFlag = false app.BityuanFlag = false
...@@ -218,7 +218,7 @@ func UpdateNode(c *gin.Context){ ...@@ -218,7 +218,7 @@ func UpdateNode(c *gin.Context){
} }
err = mv2.Wait() err = mv2.Wait()
if err != nil { if err != nil {
tlog.Error("stderr2:",mverr2.String()) tlog.Error("stderr2:","err",mverr2.String())
appG.Response(http.StatusOK, e.MV_ERROR, mverr2.String()) appG.Response(http.StatusOK, e.MV_ERROR, mverr2.String())
app.UpdateInfo.Flag = true app.UpdateInfo.Flag = true
app.BityuanFlag = false app.BityuanFlag = false
......
...@@ -106,14 +106,14 @@ func UpdatePai(c *gin.Context) { ...@@ -106,14 +106,14 @@ func UpdatePai(c *gin.Context) {
tar := exec.Command("tar","-xvf",name) tar := exec.Command("tar","-xvf",name)
err = tar.Start() err = tar.Start()
if err != nil { if err != nil {
tlog.Error("tar",err) tlog.Error("tar","err",err)
appG.Response(http.StatusOK, e.TAR_XVF_ERROR, err) appG.Response(http.StatusOK, e.TAR_XVF_ERROR, err)
app.DPercent.Flag = false app.DPercent.Flag = false
return return
} }
err = tar.Wait() err = tar.Wait()
if err != nil { if err != nil {
tlog.Error("tar",err) tlog.Error("tar","err",err)
appG.Response(http.StatusOK, e.TAR_XVF_ERROR, err) appG.Response(http.StatusOK, e.TAR_XVF_ERROR, err)
app.DPercent.Flag = false app.DPercent.Flag = false
return return
...@@ -122,14 +122,14 @@ func UpdatePai(c *gin.Context) { ...@@ -122,14 +122,14 @@ func UpdatePai(c *gin.Context) {
bak := exec.Command("cp",setting.Chain33Pai.Name,setting.Chain33Pai.Name+".bak") bak := exec.Command("cp",setting.Chain33Pai.Name,setting.Chain33Pai.Name+".bak")
err = bak.Start() err = bak.Start()
if err != nil { if err != nil {
tlog.Error("bak",err) tlog.Error("bak","err",err)
appG.Response(http.StatusOK, e.CP_ERROR, err) appG.Response(http.StatusOK, e.CP_ERROR, err)
app.DPercent.Flag = false app.DPercent.Flag = false
return return
} }
err = bak.Wait() err = bak.Wait()
if err != nil { if err != nil {
tlog.Error("bak",err) tlog.Error("bak","err",err)
appG.Response(http.StatusOK, e.CP_ERROR, err) appG.Response(http.StatusOK, e.CP_ERROR, err)
app.DPercent.Flag = false app.DPercent.Flag = false
return return
...@@ -138,14 +138,14 @@ func UpdatePai(c *gin.Context) { ...@@ -138,14 +138,14 @@ func UpdatePai(c *gin.Context) {
bakconf := exec.Command("cp","conf/app.ini","conf/app.ini.bak") bakconf := exec.Command("cp","conf/app.ini","conf/app.ini.bak")
err = bakconf.Start() err = bakconf.Start()
if err != nil { if err != nil {
tlog.Error("bakconf",err) tlog.Error("bakconf","err",err)
appG.Response(http.StatusOK, e.CP_ERROR, err) appG.Response(http.StatusOK, e.CP_ERROR, err)
app.DPercent.Flag = false app.DPercent.Flag = false
return return
} }
err = bakconf.Wait() err = bakconf.Wait()
if err != nil { if err != nil {
tlog.Error("bakconf",err) tlog.Error("bakconf","err",err)
appG.Response(http.StatusOK, e.CP_ERROR, err) appG.Response(http.StatusOK, e.CP_ERROR, err)
app.DPercent.Flag = false app.DPercent.Flag = false
return return
...@@ -154,14 +154,14 @@ func UpdatePai(c *gin.Context) { ...@@ -154,14 +154,14 @@ func UpdatePai(c *gin.Context) {
mv := exec.Command("mv",setting.Chain33Pai.Name+"_"+req.Version+"/"+setting.Chain33Pai.Name,".") mv := exec.Command("mv",setting.Chain33Pai.Name+"_"+req.Version+"/"+setting.Chain33Pai.Name,".")
err = mv.Start() err = mv.Start()
if err != nil { if err != nil {
tlog.Error("mv",err) tlog.Error("mv","err",err)
appG.Response(http.StatusOK, e.MV_ERROR, err) appG.Response(http.StatusOK, e.MV_ERROR, err)
app.DPercent.Flag = false app.DPercent.Flag = false
return return
} }
err = mv.Wait() err = mv.Wait()
if err != nil { if err != nil {
tlog.Error("mv",err) tlog.Error("mv","err",err)
appG.Response(http.StatusOK, e.MV_ERROR, err) appG.Response(http.StatusOK, e.MV_ERROR, err)
app.DPercent.Flag = false app.DPercent.Flag = false
return return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment