diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-09-02 13:43:02 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-09-02 13:43:02 +0000 |
| commit | 2cb30f153f8266d31661a7170ea838aae619447e (patch) | |
| tree | 3ba02c0e50dee71ca9ac0eb1242641a7e19d5cb3 /src/core | |
| parent | f7dd767e57563b77ecc2c4c4c2fcb7f4973375d1 (diff) | |
| download | nginx-2cb30f153f8266d31661a7170ea838aae619447e.tar.gz nginx-2cb30f153f8266d31661a7170ea838aae619447e.zip | |
the -q switch
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/nginx.c | 15 | ||||
| -rw-r--r-- | src/core/ngx_cycle.c | 3 | ||||
| -rw-r--r-- | src/core/ngx_cycle.h | 1 |
3 files changed, 15 insertions, 4 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c index 80a5d18ae..62cea7557 100644 --- a/src/core/nginx.c +++ b/src/core/nginx.c @@ -212,7 +212,7 @@ main(int argc, char *const *argv) 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 @@ main(int argc, char *const *argv) " -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 @@ main(int argc, char *const *argv) } 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_get_options(int argc, char *const *argv) 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 5973fbe23..357c6b284 100644 --- a/src/core/ngx_cycle.c +++ b/src/core/ngx_cycle.c @@ -24,6 +24,7 @@ static ngx_pool_t *ngx_temp_pool; 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 @@ ngx_init_cycle(ngx_cycle_t *old_cycle) 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 e3905885d..3f2e2229c 100644 --- a/src/core/ngx_cycle.h +++ b/src/core/ngx_cycle.h @@ -130,6 +130,7 @@ extern volatile ngx_cycle_t *ngx_cycle; 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 |