code review comments

nginx · Apr 3, 2023 · a8fd768 · a8fd768
1 parent 350483e
commit a8fd768
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/src/core/config/defaults.go b/src/core/config/defaults.go
@@ -256,6 +256,11 @@ var (
 			Usage:        "The duration the NGINX Agent will monitor error logs after a NGINX reload",
 			DefaultValue: Defaults.Nginx.ConfigReloadMonitoringPeriod,
 		},
+		&BoolFlag{
+			Name:         NginxTreatWarningsAsErrors,
+			Usage:        "On nginx -t, treat warnings as failures on configuration application.",
+			DefaultValue: Defaults.Nginx.TreatWarningsAsErrors,
+		},
 		// Metrics
 		&DurationFlag{
 			Name:         MetricsCollectionInterval,

diff --git a/src/plugins/nginx.go b/src/plugins/nginx.go
@@ -463,7 +463,7 @@ func (n *Nginx) completeConfigApply(response *NginxConfigValidationResponse) (st
 	} else {
 		rollbackError = n.monitor()
 		if rollbackError != nil {
-			nginxConfigStatusMessage = fmt.Sprintf("Config apply failed. The following errors were found in the NGINX error logs: %v", rollbackError)
+			nginxConfigStatusMessage = fmt.Sprintf("Config apply failed. Errors found during monitoring period after applying a new configuration: %v", rollbackError)
 			rollback = true
 		} else {
 			log.Info("No errors found in NGINX errors logs after NGINX reload")

diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/defaults.go b/test/performance/vendor/github.com/nginx/agent/v2/src/core/config/defaults.go
diff --git a/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/nginx.go b/test/performance/vendor/github.com/nginx/agent/v2/src/plugins/nginx.go