zishuo/Archive
1
0
Fork 0
mirror of https://github.com/bolucat/Archive.git synced 2026-04-23 00:17:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update On Thu Dec 12 11:41:03 CET 2024

Browse Source
This commit is contained in:
github-action[bot]
2024-12-12 11:41:03 +01:00
parent 82ec12ec72
commit 767320b3c9
407 changed files with 10588 additions and 10839 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mieru/pkg/cli/client.go
+15 -8
View File
@@ -34,6 +34,7 @@ import (
apicommon "github.com/enfein/mieru/v3/apis/common"
"github.com/enfein/mieru/v3/apis/constant"
"github.com/enfein/mieru/v3/pkg/appctl"
"github.com/enfein/mieru/v3/pkg/appctl/appctlcommon"
"github.com/enfein/mieru/v3/pkg/appctl/appctlgrpc"
"github.com/enfein/mieru/v3/pkg/appctl/appctlpb"
"github.com/enfein/mieru/v3/pkg/cipher"
@@ -403,14 +404,20 @@ var clientRunFunc = func(s []string) error {
log.SetFormatter(&log.DaemonFormatter{})
appctl.SetAppStatus(appctlpb.AppStatus_STARTING)
logFile, err := log.NewClientLogFile()
if err == nil {
log.SetOutput(logFile)
if err = log.RemoveOldClientLogFiles(); err != nil {
log.Errorf("remove old client log files failed: %v", err)
}
if _, found := os.LookupEnv(appctl.EnvMieruConfigFile); found {
log.Debugf("log to stdout because environment variable %s is set", appctl.EnvMieruConfigFile)
} else if _, found := os.LookupEnv(appctl.EnvMieruConfigJSONFile); found {
log.Debugf("log to stdout because environment variable %s is set", appctl.EnvMieruConfigJSONFile)
} else {
log.Infof("log to stdout due to the following reason: %v", err)
logFile, err := log.NewClientLogFile()
if err == nil {
log.SetOutput(logFile)
if err = log.RemoveOldClientLogFiles(); err != nil {
log.Errorf("remove old client log files failed: %v", err)
}
} else {
log.Infof("log to stdout because: %v", err)
}
}
// Load and verify client config.
@@ -533,7 +540,7 @@ var clientRunFunc = func(s []string) error {
return fmt.Errorf(stderror.ParseIPFailed)
}
}
portBindings, err := appctl.FlatPortBindings(serverInfo.GetPortBindings())
portBindings, err := appctlcommon.FlatPortBindings(serverInfo.GetPortBindings())
if err != nil {
return fmt.Errorf(stderror.InvalidPortBindingsErr, err)
}