fixed outputing error in ls-config, ls-routes, etc.

This commit is contained in:
yusing 2024-09-21 18:47:38 +08:00
parent 69361aea1b
commit 6388d9d44d

View file

@ -3,6 +3,7 @@ package main
import ( import (
"context" "context"
"encoding/json" "encoding/json"
"io"
"log" "log"
"net/http" "net/http"
"os" "os"
@ -35,6 +36,9 @@ func main() {
logrus.SetLevel(logrus.DebugLevel) logrus.SetLevel(logrus.DebugLevel)
} }
if args.Command != common.CommandStart {
logrus.SetOutput(io.Discard)
} else {
logrus.SetFormatter(&logrus.TextFormatter{ logrus.SetFormatter(&logrus.TextFormatter{
DisableSorting: true, DisableSorting: true,
DisableLevelTruncation: true, DisableLevelTruncation: true,
@ -42,6 +46,7 @@ func main() {
ForceColors: true, ForceColors: true,
TimestampFormat: "01-02 15:04:05", TimestampFormat: "01-02 15:04:05",
}) })
}
if args.Command == common.CommandReload { if args.Command == common.CommandReload {
if err := apiUtils.ReloadServer(); err.HasError() { if err := apiUtils.ReloadServer(); err.HasError() {
@ -59,15 +64,15 @@ func main() {
err = config.Validate(data).Error() err = config.Validate(data).Error()
} }
if err != nil { if err != nil {
l.Fatal("config error: ", err) log.Fatal("config error: ", err)
} }
l.Printf("config OK") log.Print("config OK")
return return
} }
cfg, err := config.Load() cfg, err := config.Load()
if err.IsFatal() { if err.IsFatal() {
l.Fatal(err) log.Fatal(err)
} }
if args.Command == common.CommandListConfigs { if args.Command == common.CommandListConfigs {