Buriburizaemon/V2bX
1
0
Fork 0
mirror of https://github.com/wyx2685/V2bX.git synced 2026-02-04 04:30:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

change log to logrus

Browse Source
This commit is contained in:
yuzuki999
2023-06-30 11:07:27 +08:00
parent 07b7ec9b3e
commit 65629c0dfb
9 changed files with 105 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/cmd.go
View File

@@ -1,7 +1,7 @@
package cmd
import (
"log"
log "github.com/sirupsen/logrus"
_ "github.com/Yuzuki616/V2bX/core/imports"
"github.com/spf13/cobra"
@@ -14,6 +14,6 @@ var command = &cobra.Command{
func Run() {
err := command.Execute()
if err != nil {
log.Println("execute failed, error:", err)
log.WithField("err", err).Error("Execute command failed")
}
}

30
cmd/server.go
View File

@@ -1,7 +1,7 @@
package cmd
import (
"log"
log "github.com/sirupsen/logrus"
"os"
"os/signal"
"runtime"
@@ -42,23 +42,26 @@ func serverHandle(_ *cobra.Command, _ []string) {
c := conf.New()
err := c.LoadFromPath(config)
if err != nil {
log.Fatalf("can't unmarshal config file: %s \n", err)
log.WithField("err", err).Error("Load config file failed")
return
}
limiter.Init()
log.Println("Start V2bX...")
log.Info("Start V2bX...")
vc, err := vCore.NewCore(&c.CoreConfig)
if err != nil {
log.Fatalf("New core error: %s", err)
log.WithField("err", err).Error("new core failed")
return
}
err = vc.Start()
if err != nil {
log.Fatalf("Start core error: %s", err)
log.WithField("err", err).Error("Start core failed")
return
}
defer vc.Close()
nodes := node.New()
err = nodes.Start(c.NodesConfig, vc)
if err != nil {
log.Fatalf("Run nodes error: %s", err)
log.WithField("err", err).Error("Run nodes failed")
return
}
if watch {
@@ -66,24 +69,29 @@ func serverHandle(_ *cobra.Command, _ []string) {
nodes.Close()
err = vc.Close()
if err != nil {
log.Fatalf("Failed to restart xray-core: %s", err)
log.WithField("err", err).Error("Restart node failed")
return
}
vc, err = vCore.NewCore(&c.CoreConfig)
if err != nil {
log.Fatalf("New core error: %s", err)
log.WithField("err", err).Error("New core failed")
return
}
err = vc.Start()
if err != nil {
log.Fatalf("Start core error: %s", err)
log.WithField("err", err).Error("Start core failed")
return
}
err = nodes.Start(c.NodesConfig, vc)
if err != nil {
log.Fatalf("Run nodes error: %s", err)
log.WithField("err", err).Error("Run nodes failed")
return
}
runtime.GC()
})
if err != nil {
log.Fatalf("Watch config file error: %s", err)
log.WithField("err", err).Error("start watch failed")
return
}
}
// clear memory