summaryrefslogtreecommitdiffstats
path: root/os
diff options
context:
space:
mode:
authorStefan Fritsch <sf@apache.org>2011-12-03 00:02:04 +0100
committerStefan Fritsch <sf@apache.org>2011-12-03 00:02:04 +0100
commit92e366007c7936f44eef10f88a7042bc5a663c05 (patch)
tree491eaace700df8e1a764c7dfbe25335d497d0dcb /os
parentmod_proxy: Make ap_proxy_retry_worker() into an optional function. Allows (diff)
downloadapache2-92e366007c7936f44eef10f88a7042bc5a663c05.tar.xz
apache2-92e366007c7936f44eef10f88a7042bc5a663c05.zip
Add lots of unique tags to error log messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'os')
-rw-r--r--os/bs2000/os.c4
-rw-r--r--os/unix/unixd.c20
2 files changed, 12 insertions, 12 deletions
diff --git a/os/bs2000/os.c b/os/bs2000/os.c
index 0869ff4cbf..9dc776dfcc 100644
--- a/os/bs2000/os.c
+++ b/os/bs2000/os.c
@@ -85,7 +85,7 @@ int os_init_job_environment(server_rec *server, const char *user_name, int one_p
type = forktype = bs2_noFORK;
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, server,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, server, APLOGNO(02170)
"The debug mode of Apache should only "
"be started by an unprivileged user!");
return 0;
@@ -115,7 +115,7 @@ pid_t os_fork(const char *user)
pid = ufork(username);
if (pid == -1 && errno == EPERM) {
ap_log_error(APLOG_MARK, APLOG_EMERG, errno,
- ap_server_conf, "ufork: Possible mis-configuration "
+ ap_server_conf, APLOGNO(02171) "ufork: Possible mis-configuration "
"for user %s - Aborting.", user);
exit(1);
}
diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index e29fb16d1d..360b935686 100644
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -69,7 +69,7 @@ AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
limit = *plimit;
if ((getrlimit(type, limit)) != 0) {
*plimit = NULL;
- ap_log_error(APLOG_MARK, APLOG_ERR, errno, cmd->server,
+ ap_log_error(APLOG_MARK, APLOG_ERR, errno, cmd->server, APLOGNO(02172)
"%s: getrlimit failed", cmd->cmd->name);
return;
}
@@ -83,7 +83,7 @@ AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
}
}
else {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server, APLOGNO(02173)
"Invalid parameters for %s", cmd->cmd->name);
return;
}
@@ -96,7 +96,7 @@ AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
if (geteuid()) {
limit->rlim_cur = cur;
if (max && (max > limit->rlim_max)) {
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server, APLOGNO(02174)
"Must be uid 0 to raise maximum %s", cmd->cmd->name);
}
else if (max) {
@@ -113,7 +113,7 @@ AP_DECLARE(void) ap_unixd_set_rlimit(cmd_parms *cmd, struct rlimit **plimit,
}
#else
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, cmd->server, APLOGNO(02175)
"Platform does not support rlimit for %s", cmd->cmd->name);
#endif
}
@@ -307,7 +307,7 @@ AP_DECLARE(apr_status_t) ap_unixd_accept(void **accepted, ap_listen_rec *lr,
#ifdef _OSD_POSIX
apr_os_sock_get(&sockdes, csd);
if (sockdes >= FD_SETSIZE) {
- ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf,
+ ap_log_error(APLOG_MARK, APLOG_WARNING, 0, ap_server_conf, APLOGNO(02176)
"new file descriptor %d is too large; you probably need "
"to rebuild Apache with a larger FD_SETSIZE "
"(currently %d)",
@@ -414,7 +414,7 @@ AP_DECLARE(apr_status_t) ap_unixd_accept(void **accepted, ap_listen_rec *lr,
* Ben Hyde noted that temporary ENETDOWN situations
* occur in mobile IP.
*/
- ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf,
+ ap_log_error(APLOG_MARK, APLOG_EMERG, status, ap_server_conf, APLOGNO(02177)
"apr_socket_accept: giving up.");
return APR_EGENERAL;
#endif /*ENETDOWN*/
@@ -425,11 +425,11 @@ AP_DECLARE(apr_status_t) ap_unixd_accept(void **accepted, ap_listen_rec *lr,
* Do not print an error in this case.
*/
if (!lr->active) {
- ap_log_error(APLOG_MARK, APLOG_DEBUG, status, ap_server_conf,
+ ap_log_error(APLOG_MARK, APLOG_DEBUG, status, ap_server_conf, APLOGNO(02178)
"apr_socket_accept failed for inactive listener");
return status;
}
- ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf,
+ ap_log_error(APLOG_MARK, APLOG_ERR, status, ap_server_conf, APLOGNO(02179)
"apr_socket_accept: (client socket)");
return APR_EGENERAL;
}
@@ -496,7 +496,7 @@ int os_init_job_environment(server_rec *server, const char *user_name, int one_p
type = forktype = bs2_noFORK;
- ap_log_error(APLOG_MARK, APLOG_ERR, 0, server,
+ ap_log_error(APLOG_MARK, APLOG_ERR, 0, server, APLOGNO(02180)
"The debug mode of Apache should only "
"be started by an unprivileged user!");
return 0;
@@ -526,7 +526,7 @@ pid_t os_fork(const char *user)
pid = ufork(username);
if (pid == -1 && errno == EPERM) {
ap_log_error(APLOG_MARK, APLOG_EMERG, errno,
- ap_server_conf, "ufork: Possible mis-configuration "
+ ap_server_conf, APLOGNO(02181) "ufork: Possible mis-configuration "
"for user %s - Aborting.", user);
exit(1);
}