the -q switch
diff --git a/src/core/nginx.c b/src/core/nginx.c index 80a5d18..62cea75 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c
@@ -212,7 +212,7 @@ if (ngx_show_help) { ngx_log_stderr(0, - "Usage: nginx [-?hvVt] [-s signal] [-c filename] " + "Usage: nginx [-?hvVtq] [-s signal] [-c filename] " "[-p prefix] [-g directives]" CRLF CRLF "Options:" CRLF " -?,-h : this help" CRLF @@ -220,6 +220,8 @@ " -V : show version and configure options then exit" CRLF " -t : test configuration and exit" CRLF + " -q : suppress non-error messages " + "during configuration testing" CRLF " -s signal : send signal to a master process: " "stop, quit, reopen, reload" CRLF #ifdef NGX_PREFIX @@ -332,8 +334,11 @@ } if (ngx_test_config) { - ngx_log_stderr(0, "configuration file %s test is successful", - cycle->conf_file.data); + if (!ngx_quiet_mode) { + ngx_log_stderr(0, "configuration file %s test is successful", + cycle->conf_file.data); + } + return 0; } @@ -685,6 +690,10 @@ ngx_test_config = 1; break; + case 'q': + ngx_quiet_mode = 1; + break; + case 'p': if (*p) { ngx_prefix = p;
diff --git a/src/core/ngx_cycle.c b/src/core/ngx_cycle.c index 5973fbe..357c6b2 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c
@@ -24,6 +24,7 @@ static ngx_event_t ngx_cleaner_event; ngx_uint_t ngx_test_config; +ngx_uint_t ngx_quiet_mode; #if (NGX_THREADS) ngx_tls_key_t ngx_core_tls_key; @@ -266,7 +267,7 @@ return NULL; } - if (ngx_test_config) { + if (ngx_test_config && !ngx_quiet_mode) { ngx_log_stderr(0, "the configuration file %s syntax is ok", cycle->conf_file.data); }
diff --git a/src/core/ngx_cycle.h b/src/core/ngx_cycle.h index e390588..3f2e222 100644 --- a/src/core/ngx_cycle.h +++ b/src/core/ngx_cycle.h
@@ -130,6 +130,7 @@ extern ngx_array_t ngx_old_cycles; extern ngx_module_t ngx_core_module; extern ngx_uint_t ngx_test_config; +extern ngx_uint_t ngx_quiet_mode; #if (NGX_THREADS) extern ngx_tls_key_t ngx_core_tls_key; #endif