Mercurial > hg > nginx
diff src/core/nginx.c @ 3750:ffbdaa3c70d6
the -q switch
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 02 Sep 2010 13:43:02 +0000 |
parents | dd1570b6f237 |
children | 89002ac695e5 |
line wrap: on
line diff
--- a/src/core/nginx.c Thu Aug 26 12:33:08 2010 +0000 +++ b/src/core/nginx.c Thu Sep 02 13:43:02 2010 +0000 @@ -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;