diff options
| author | Stefan Fritsch <sf@apache.org> | 2013-03-31 23:12:00 +0200 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2013-03-31 23:12:00 +0200 |
| commit | a68ec08398a2cba5d56af20ef1f1d1b5243f0be6 (patch) | |
| tree | ce37f44c6b8f275487e811325789c470d9ea213b | |
| parent | Remove partial non-working implementation of MD5-sess and qop=auth-int. (diff) | |
| download | apache2-a68ec08398a2cba5d56af20ef1f1d1b5243f0be6.tar.xz apache2-a68ec08398a2cba5d56af20ef1f1d1b5243f0be6.zip | |
use ap_log_error's facility to print the apr error string instead of
calling apr_strerror() explicitly
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1463052 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | server/log.c | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/server/log.c b/server/log.c index 6ec5f4f5b9..5b905c62d1 100644 --- a/server/log.c +++ b/server/log.c @@ -1552,11 +1552,10 @@ static apr_status_t piped_log_spawn(piped_log *pl) ((status = apr_procattr_child_errfn_set(procattr, log_child_errfn)) != APR_SUCCESS) || ((status = apr_procattr_error_check_set(procattr, 1)) != APR_SUCCESS)) { - char buf[120]; /* Something bad happened, give up and go away. */ - ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, APLOGNO(00103) - "piped_log_spawn: unable to setup child process '%s': %s", - pl->program, apr_strerror(status, buf, sizeof(buf))); + ap_log_error(APLOG_MARK, APLOG_STARTUP, status, NULL, APLOGNO(00103) + "piped_log_spawn: unable to setup child process '%s'", + pl->program); } else { char **args; @@ -1580,11 +1579,10 @@ static apr_status_t piped_log_spawn(piped_log *pl) close_handle_in_child(pl->p, pl->read_fd); } else { - char buf[120]; /* Something bad happened, give up and go away. */ - ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, APLOGNO(00104) - "unable to start piped log program '%s': %s", - pl->program, apr_strerror(status, buf, sizeof(buf))); + ap_log_error(APLOG_MARK, APLOG_STARTUP, status, NULL, APLOGNO(00104) + "unable to start piped log program '%s'", + pl->program); } } @@ -1595,7 +1593,7 @@ static apr_status_t piped_log_spawn(piped_log *pl) static void piped_log_maintenance(int reason, void *data, apr_wait_t status) { piped_log *pl = data; - apr_status_t stats; + apr_status_t rv; int mpm_state; switch (reason) { @@ -1605,8 +1603,8 @@ static void piped_log_maintenance(int reason, void *data, apr_wait_t status) * tells other logic not to try to kill it */ apr_proc_other_child_unregister(pl); - stats = ap_mpm_query(AP_MPMQ_MPM_STATE, &mpm_state); - if (stats != APR_SUCCESS) { + rv = ap_mpm_query(AP_MPMQ_MPM_STATE, &mpm_state); + if (rv != APR_SUCCESS) { ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, APLOGNO(00105) "can't query MPM state; not restarting " "piped log program '%s'", @@ -1616,13 +1614,12 @@ static void piped_log_maintenance(int reason, void *data, apr_wait_t status) ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, APLOGNO(00106) "piped log program '%s' failed unexpectedly", pl->program); - if ((stats = piped_log_spawn(pl)) != APR_SUCCESS) { + if ((rv = piped_log_spawn(pl)) != APR_SUCCESS) { /* what can we do? This could be the error log we're having * problems opening up... */ - char buf[120]; - ap_log_error(APLOG_MARK, APLOG_STARTUP, 0, NULL, APLOGNO(00107) - "piped_log_maintenance: unable to respawn '%s': %s", - pl->program, apr_strerror(stats, buf, sizeof(buf))); + ap_log_error(APLOG_MARK, APLOG_STARTUP, rv, NULL, APLOGNO(00107) + "piped_log_maintenance: unable to respawn '%s'", + pl->program); } } break; |