diff options
| author | Stefan Fritsch <sf@apache.org> | 2011-12-07 22:33:35 +0000 |
|---|---|---|
| committer | Stefan Fritsch <sf@apache.org> | 2011-12-07 22:33:35 +0000 |
| commit | 53164d250f83bcc0eee81ad947f5fc002724e610 (patch) | |
| tree | b50f8fc1b985e266be215f67398659feff0db5a9 /modules/examples | |
| parent | 0ecd2fe5e5a5bb76a6d7786f2147c2fd963272c5 (diff) | |
| download | httpd-53164d250f83bcc0eee81ad947f5fc002724e610.tar.gz | |
Various fixes for log message tags:
- Remove tags in ssl_log_ssl_error() and ssl_log_cert_error()
- Instead add tags to various ssl_log_xerror, ssl_log_cxerror
calls (ssl_log_rxerror is unused).
- likewise for modssl_proxy_info_log()
- Fix spelling of APLOG_NOERRNO in coccinelle script
- add support for ssl_log_*error and ap_log_cserror
- add some more tags missing due to APLOG_NOERRNO spelling error
- Remove tags from example modules (we don't want people to blindly copy
those)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1211680 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules/examples')
| -rw-r--r-- | modules/examples/mod_example_hooks.c | 3 | ||||
| -rw-r--r-- | modules/examples/mod_example_ipc.c | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/modules/examples/mod_example_hooks.c b/modules/examples/mod_example_hooks.c index 6f8a1e72a8..743c395065 100644 --- a/modules/examples/mod_example_hooks.c +++ b/modules/examples/mod_example_hooks.c @@ -328,8 +328,7 @@ static x_cfg *our_cconfig(const conn_rec *c) static void example_log_each(apr_pool_t *p, server_rec *s, const char *note) { if (s != NULL) { - ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, APLOGNO(02062) "mod_example: %s", - note); + ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, s, "mod_example: %s", note); } else { apr_file_t *out = NULL; apr_file_open_stderr(&out, p); diff --git a/modules/examples/mod_example_ipc.c b/modules/examples/mod_example_ipc.c index 27c87443de..b8ba569c06 100644 --- a/modules/examples/mod_example_ipc.c +++ b/modules/examples/mod_example_ipc.c @@ -141,7 +141,7 @@ static int exipc_post_config(apr_pool_t *pconf, apr_pool_t *plog, */ rs = apr_temp_dir_get(&tempdir, pconf); if (APR_SUCCESS != rs) { - ap_log_error(APLOG_MARK, APLOG_ERR, rs, s, APLOGNO(02063) + ap_log_error(APLOG_MARK, APLOG_ERR, rs, s, "Failed to find temporary directory"); return HTTP_INTERNAL_SERVER_ERROR; } @@ -159,7 +159,7 @@ static int exipc_post_config(apr_pool_t *pconf, apr_pool_t *plog, rs = apr_shm_create(&exipc_shm, sizeof(exipc_data), (const char *) shmfilename, pconf); if (APR_SUCCESS != rs) { - ap_log_error(APLOG_MARK, APLOG_ERR, rs, s, APLOGNO(02064) + ap_log_error(APLOG_MARK, APLOG_ERR, rs, s, "Failed to create shared memory segment on file %s", shmfilename); return HTTP_INTERNAL_SERVER_ERROR; @@ -204,7 +204,7 @@ static void exipc_child_init(apr_pool_t *p, server_rec *s) apr_global_mutex_lockfile(exipc_mutex), p); if (APR_SUCCESS != rs) { - ap_log_error(APLOG_MARK, APLOG_CRIT, rs, s, APLOGNO(02065) + ap_log_error(APLOG_MARK, APLOG_CRIT, rs, s, "Failed to reopen mutex %s in child", exipc_mutex_type); /* There's really nothing else we can do here, since This @@ -261,14 +261,14 @@ static int exipc_handler(request_rec *r) break; /* Out of the loop */ } else { /* Some error, log and bail */ - ap_log_error(APLOG_MARK, APLOG_ERR, rs, r->server, APLOGNO(02066) + ap_log_error(APLOG_MARK, APLOG_ERR, rs, r->server, "Child %ld failed to acquire lock", (long int)getpid()); break; /* Out of the loop without having the lock */ } } else { /* Some other error, log and bail */ - ap_log_error(APLOG_MARK, APLOG_ERR, rs, r->server, APLOGNO(02067) + ap_log_error(APLOG_MARK, APLOG_ERR, rs, r->server, "Child %ld failed to try and acquire lock", (long int)getpid()); break; /* Out of the loop without having the lock */ |