Mercurial > hg > nginx

comparison src/os/unix/ngx_process.c @ 4246:d3568507db51 stable-1.0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merging r4132, r4134, r4143, r4183, r4191, r4199: Various fixes related to error messages: *) Removed old warning that suggested to use "server_name_in_redirect off" (now the default) in place of no longer supported "server_name *". *) Fixing directive name in error message if types hash size is not enough. *) Replaced "can not" with "cannot" and "could not" in a bunch of places. Fixed nearby grammar errors. *) Overhauled error messages.
author Igor Sysoev <igor@sysoev.ru>
date Tue, 01 Nov 2011 13:24:50 +0000
parents df9d3dd8cfc0
children 3f6040cd731e 4919fb357a5d
comparison
equal deleted inserted replaced
4245:8d39230df833 4246:d3568507db51
539 } 539 }
540 540
541 if (WEXITSTATUS(status) == 2 && ngx_processes[i].respawn) { 541 if (WEXITSTATUS(status) == 2 && ngx_processes[i].respawn) {
542 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0, 542 ngx_log_error(NGX_LOG_ALERT, ngx_cycle->log, 0,
543 "%s %P exited with fatal code %d " 543 "%s %P exited with fatal code %d "
544 "and can not be respawn", 544 "and cannot be respawned",
545 process, pid, WEXITSTATUS(status)); 545 process, pid, WEXITSTATUS(status));
546 ngx_processes[i].respawn = 0; 546 ngx_processes[i].respawn = 0;
547 } 547 }
548 } 548 }
549 } 549 }