KJZH001/nezhahq-agent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add option to disable syslog logging (#53)

Browse Source 
* feat: add option to disable syslog logging

* missing comments

* service flags

* initialize util.Logger
This commit is contained in:
UUBulb 2024-08-09 22:03:41 +08:00 committed by GitHub
parent 1f7706201b
commit ac1a34e33e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/agent/main.go
View File

@ -54,6 +54,7 @@ type AgentCliParam struct {
IPReportPeriod uint32 // 上报IP间隔 IPReportPeriod uint32 // 上报IP间隔
UseIPv6CountryCode bool // 默认优先展示IPv6旗帜 UseIPv6CountryCode bool // 默认优先展示IPv6旗帜
UseGiteeToUpgrade bool // 强制从Gitee获取更新 UseGiteeToUpgrade bool // 强制从Gitee获取更新
DisableSyslog bool // 将日志输出到stderr
} }
var ( var (
@ -67,11 +68,7 @@ var (
var agentCmd = &cobra.Command{ var agentCmd = &cobra.Command{
Use: "agent", Use: "agent",
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
if runtime.GOOS == "darwin" {
run() // https://github.com/golang/go/issues/59229
} else {
runService("", nil) runService("", nil)
}
}, },
PreRun: preRun, PreRun: preRun,
PersistentPreRun: persistPreRun, PersistentPreRun: persistPreRun,
@ -155,9 +152,15 @@ func init() {
agentCmd.PersistentFlags().BoolVar(&agentConfig.GPU, "gpu", false, "启用GPU监控") agentCmd.PersistentFlags().BoolVar(&agentConfig.GPU, "gpu", false, "启用GPU监控")
agentCmd.PersistentFlags().BoolVar(&agentConfig.Temperature, "temperature", false, "启用温度监控") agentCmd.PersistentFlags().BoolVar(&agentConfig.Temperature, "temperature", false, "启用温度监控")
agentCmd.PersistentFlags().BoolVar(&agentCliParam.UseGiteeToUpgrade, "gitee", false, "使用Gitee获取更新") agentCmd.PersistentFlags().BoolVar(&agentCliParam.UseGiteeToUpgrade, "gitee", false, "使用Gitee获取更新")
agentCmd.PersistentFlags().BoolVar(&agentCliParam.DisableSyslog, "disable-syslog", false, "将日志输出到stderr")
agentCmd.PersistentFlags().Uint32VarP(&agentCliParam.IPReportPeriod, "ip-report-period", "u", 30*60, "本地IP更新间隔, 上报频率依旧取决于report-delay的值") agentCmd.PersistentFlags().Uint32VarP(&agentCliParam.IPReportPeriod, "ip-report-period", "u", 30*60, "本地IP更新间隔, 上报频率依旧取决于report-delay的值")
agentCmd.Flags().BoolVarP(&agentCliParam.Version, "version", "v", false, "查看当前版本号") agentCmd.Flags().BoolVarP(&agentCliParam.Version, "version", "v", false, "查看当前版本号")
// https://github.com/golang/go/issues/59229
if runtime.GOOS == "darwin" {
agentCliParam.DisableSyslog = true
}
agentConfig.Read(filepath.Dir(ex) + "/config.yml") agentConfig.Read(filepath.Dir(ex) + "/config.yml")
monitor.InitConfig(&agentConfig) monitor.InitConfig(&agentConfig)
@ -324,10 +327,12 @@ func runService(action string, flags []string) {
prg.service = s prg.service = s
errs := make(chan error, 5) errs := make(chan error, 5)
if !agentCliParam.DisableSyslog {
util.Logger, err = s.Logger(errs) util.Logger, err = s.Logger(errs)
if err != nil { if err != nil {
log.Fatal(err) log.Fatal(err)
} }
}
go func() { go func() {
for { for {

1
cmd/agent/service.go
View File

@ -87,6 +87,7 @@ func serviceActions(cmd *cobra.Command, args []string) {
{agentCliParam.UseIPv6CountryCode, "--use-ipv6-countrycode", ""}, {agentCliParam.UseIPv6CountryCode, "--use-ipv6-countrycode", ""},
{agentConfig.GPU, "--gpu", ""}, {agentConfig.GPU, "--gpu", ""},
{agentCliParam.UseGiteeToUpgrade, "--gitee", ""}, {agentCliParam.UseGiteeToUpgrade, "--gitee", ""},
{agentCliParam.DisableSyslog, "--disable-syslog", ""},
{agentCliParam.IPReportPeriod != 30*60, "-u", fmt.Sprint(agentCliParam.IPReportPeriod)}, {agentCliParam.IPReportPeriod != 30*60, "-u", fmt.Sprint(agentCliParam.IPReportPeriod)},
} }

8
pkg/util/util.go
View File

@ -3,7 +3,6 @@ package util
import ( import (
"fmt" "fmt"
"os" "os"
"runtime"
"time" "time"
jsoniter "github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
@ -12,7 +11,7 @@ import (
var ( var (
Json = jsoniter.ConfigCompatibleWithStandardLibrary Json = jsoniter.ConfigCompatibleWithStandardLibrary
Logger service.Logger Logger service.Logger = service.ConsoleLogger
) )
func IsWindows() bool { func IsWindows() bool {
@ -21,11 +20,6 @@ func IsWindows() bool {
func Println(enabled bool, v ...interface{}) { func Println(enabled bool, v ...interface{}) {
if enabled { if enabled {
if runtime.GOOS != "darwin" {
Logger.Infof("NEZHA@%s>> %v", time.Now().Format("2006-01-02 15:04:05"), fmt.Sprint(v...)) Logger.Infof("NEZHA@%s>> %v", time.Now().Format("2006-01-02 15:04:05"), fmt.Sprint(v...))
} else {
fmt.Printf("NEZHA@%s>> ", time.Now().Format("2006-01-02 15:04:05"))
fmt.Println(v...)
}
} }
} }