starred/netbird
1
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-03-31 06:34:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

[client] Fix duplicate log lines in containers (#5609)

Browse Source
This commit is contained in:
Viktor Liu
2026-03-19 22:53:05 +08:00
committed by GitHub
parent a1858a9cb7
commit 5ffaa5cdd6
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/cmd/service_controller.go
View File

@@ -103,7 +103,7 @@ func (p *program) Stop(srv service.Service) error {
// Common setup for service control commands // Common setup for service control commands
func setupServiceControlCommand(cmd *cobra.Command, ctx context.Context, cancel context.CancelFunc) (service.Service, error) { func setupServiceControlCommand(cmd *cobra.Command, ctx context.Context, cancel context.CancelFunc) (service.Service, error) {
SetFlagsFromEnvVars(rootCmd) // rootCmd env vars are already applied by PersistentPreRunE.
SetFlagsFromEnvVars(serviceCmd) SetFlagsFromEnvVars(serviceCmd)
cmd.SetOut(cmd.OutOrStdout()) cmd.SetOut(cmd.OutOrStdout())

6
util/log.go
View File

@@ -43,7 +43,13 @@ func InitLogger(logger *log.Logger, logLevel string, logs ...string) error {
var writers []io.Writer var writers []io.Writer
logFmt := os.Getenv("NB_LOG_FORMAT") logFmt := os.Getenv("NB_LOG_FORMAT")
seen := make(map[string]bool, len(logs))
for _, logPath := range logs { for _, logPath := range logs {
if seen[logPath] {
continue
}
seen[logPath] = true
switch logPath { switch logPath {
case LogSyslog: case LogSyslog:
AddSyslogHookToLogger(logger) AddSyslogHookToLogger(logger)