support config-strict on windows too

osrg · Dec 2, 2024 · 284e1e9 · 284e1e9
1 parent fb7102b
commit 284e1e9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/cmd/gobgpd/util.go b/cmd/gobgpd/util.go
@@ -114,8 +114,7 @@ func (l *builtinLogger) Panic(msg string, fields log.Fields) {
 }
 
 func (l *builtinLogger) Fatal(msg string, fields log.Fields) {
-	if facility, hasFacility := fields[log.FieldFacility];
-		hasFacility && facility == log.FacilityConfig && !l.cfgStrict {
+	if fields.HasFacility(log.FacilityConfig) && !l.cfgStrict {
 		// Backward compatibility with old behavior when any logical config error was treated as warning
 		l.logger.WithFields(logrus.Fields(fields)).Warn(msg)
 		return

diff --git a/cmd/gobgpd/util_windows.go b/cmd/gobgpd/util_windows.go
@@ -29,10 +29,17 @@ func addSyslogHook(_, _ string) error {
 }
 
 type builtinLogger struct {
-	logger *logrus.Logger
+	logger    *logrus.Logger
+	cfgStrict bool
 }
 
 func (l *builtinLogger) Panic(msg string, fields log.Fields) {
+	if fields.HasFacility(log.FacilityConfig) && !l.cfgStrict {
+		// Backward compatibility with old behavior when any logical config error was treated as warning
+		l.logger.WithFields(logrus.Fields(fields)).Warn(msg)
+		return
+	}
+
 	l.logger.WithFields(logrus.Fields(fields)).Panic(msg)
 }
 

diff --git a/pkg/config/server_config_test.go b/pkg/config/server_config_test.go
@@ -18,7 +18,7 @@ type configErrorLogger struct {
 }
 
 func (l *configErrorLogger) Fatal(msg string, fields log.Fields) {
-	if facility, hasFacility := fields[log.FieldFacility]; hasFacility && facility == log.FacilityConfig {
+	if fields.HasFacility(log.FacilityConfig) {
 		l.configErrors = append(l.configErrors, msg)
 		l.DefaultLogger.Error(msg, fields)
 	} else {

diff --git a/pkg/log/logger.go b/pkg/log/logger.go
@@ -42,6 +42,13 @@ var (
 
 type Fields map[string]interface{}
 
+func (fields Fields) HasFacility(facility interface{}) bool {
+	if fieldsFacility, hasFacility := fields[FieldFacility]; hasFacility && fieldsFacility == facility {
+		return true
+	}
+	return false
+}
+
 type Logger interface {
 	Panic(msg string, fields Fields)
 	Fatal(msg string, fields Fields)