This is an automated email from the ASF dual-hosted git repository.
rjung pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new 705ba75d1 Switch from logger to log context - part 3:
705ba75d1 is described below
commit 705ba75d17ffd9ff214809abdcb753f3a965f4eb
Author: Rainer Jung <[email protected]>
AuthorDate: Thu Jun 23 20:50:05 2022 +0200
Switch from logger to log context - part 3:
- Switch local declarations from jk_logger_t
to jk_log_context_t.
---
native/common/jk_ajp12_worker.c | 22 +++---
native/common/jk_ajp13.c | 2 +-
native/common/jk_ajp13_worker.c | 10 +--
native/common/jk_ajp14.c | 28 ++++----
native/common/jk_ajp14_worker.c | 18 ++---
native/common/jk_ajp_common.c | 60 ++++++++---------
native/common/jk_connect.c | 26 ++++----
native/common/jk_lb_worker.c | 70 ++++++++++----------
native/common/jk_map.c | 14 ++--
native/common/jk_msg_buff.c | 2 +-
native/common/jk_shm.c | 26 ++++----
native/common/jk_status.c | 136 +++++++++++++++++++-------------------
native/common/jk_uri_worker_map.c | 40 +++++------
native/common/jk_util.c | 6 +-
native/common/jk_worker.c | 22 +++---
15 files changed, 241 insertions(+), 241 deletions(-)
diff --git a/native/common/jk_ajp12_worker.c b/native/common/jk_ajp12_worker.c
index 38f324a60..2f757d79f 100644
--- a/native/common/jk_ajp12_worker.c
+++ b/native/common/jk_ajp12_worker.c
@@ -79,10 +79,10 @@ static int ajpv12_sendnbytes(ajp12_endpoint_t * p,
static int ajpv12_flush(ajp12_endpoint_t * p);
static int ajpv12_handle_response(ajp12_endpoint_t * p,
- jk_ws_service_t *s, jk_logger_t *l);
+ jk_ws_service_t *s, jk_log_context_t *l);
static int ajpv12_handle_request(ajp12_endpoint_t * p,
- jk_ws_service_t *s, jk_logger_t *l);
+ jk_ws_service_t *s, jk_log_context_t *l);
/*
* Return values of service() method for ajp12 worker:
@@ -99,7 +99,7 @@ static int ajpv12_handle_request(ajp12_endpoint_t * p,
*/
static int JK_METHOD service(jk_endpoint_t *e,
jk_ws_service_t *s,
- jk_logger_t *l, int *is_error)
+ jk_log_context_t *l, int *is_error)
{
ajp12_endpoint_t *p;
unsigned int attempt;
@@ -157,7 +157,7 @@ static int JK_METHOD service(jk_endpoint_t *e,
return JK_FALSE;
}
-static int JK_METHOD done(jk_endpoint_t **e, jk_logger_t *l)
+static int JK_METHOD done(jk_endpoint_t **e, jk_log_context_t *l)
{
jk_log(l, JK_LOG_DEBUG, "Into jk_endpoint_t::done");
if (e && *e && (*e)->endpoint_private) {
@@ -176,7 +176,7 @@ static int JK_METHOD done(jk_endpoint_t **e, jk_logger_t *l)
static int JK_METHOD validate(jk_worker_t *pThis,
jk_map_t *props,
- jk_worker_env_t *we, jk_logger_t *l)
+ jk_worker_env_t *we, jk_log_context_t *l)
{
jk_log(l, JK_LOG_DEBUG, "Into jk_worker_t::validate");
@@ -231,14 +231,14 @@ static int JK_METHOD validate(jk_worker_t *pThis,
static int JK_METHOD init(jk_worker_t *pThis,
jk_map_t *props,
- jk_worker_env_t *we, jk_logger_t *log)
+ jk_worker_env_t *we, jk_log_context_t *log)
{
/* Nothing to do for now */
return JK_TRUE;
}
static int JK_METHOD get_endpoint(jk_worker_t *pThis,
- jk_endpoint_t **pend, jk_logger_t *l)
+ jk_endpoint_t **pend, jk_log_context_t *l)
{
jk_log(l, JK_LOG_DEBUG, "Into jk_worker_t::get_endpoint");
@@ -265,7 +265,7 @@ static int JK_METHOD get_endpoint(jk_worker_t *pThis,
return JK_FALSE;
}
-static int JK_METHOD destroy(jk_worker_t **pThis, jk_logger_t *l)
+static int JK_METHOD destroy(jk_worker_t **pThis, jk_log_context_t *l)
{
jk_log(l, JK_LOG_DEBUG, "Into jk_worker_t::destroy");
if (pThis && *pThis && (*pThis)->worker_private) {
@@ -281,7 +281,7 @@ static int JK_METHOD destroy(jk_worker_t **pThis,
jk_logger_t *l)
}
int JK_METHOD ajp12_worker_factory(jk_worker_t **w,
- const char *name, jk_logger_t *l)
+ const char *name, jk_log_context_t *l)
{
jk_log(l, JK_LOG_DEBUG, "Into ajp12_worker_factory");
if (NULL != name && NULL != w) {
@@ -399,7 +399,7 @@ static int ajpv12_flush(ajp12_endpoint_t * p)
}
static int ajpv12_handle_request(ajp12_endpoint_t * p,
- jk_ws_service_t *s, jk_logger_t *l)
+ jk_ws_service_t *s, jk_log_context_t *l)
{
int ret;
@@ -541,7 +541,7 @@ static int ajpv12_handle_request(ajp12_endpoint_t * p,
}
static int ajpv12_handle_response(ajp12_endpoint_t * p,
- jk_ws_service_t *s, jk_logger_t *l)
+ jk_ws_service_t *s, jk_log_context_t *l)
{
int status = 200;
char *reason = NULL;
diff --git a/native/common/jk_ajp13.c b/native/common/jk_ajp13.c
index 5488f7ddb..902d9d3db 100644
--- a/native/common/jk_ajp13.c
+++ b/native/common/jk_ajp13.c
@@ -28,7 +28,7 @@
#include "jk_ajp13.h"
int ajp13_marshal_shutdown_into_msgb(jk_msg_buf_t *msg,
- jk_pool_t *p, jk_logger_t *l)
+ jk_pool_t *p, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
/* To be on the safe side */
diff --git a/native/common/jk_ajp13_worker.c b/native/common/jk_ajp13_worker.c
index e399897b6..031d6c721 100644
--- a/native/common/jk_ajp13_worker.c
+++ b/native/common/jk_ajp13_worker.c
@@ -28,7 +28,7 @@
/* -------------------- Method -------------------- */
static int JK_METHOD validate(jk_worker_t *pThis,
jk_map_t *props,
- jk_worker_env_t *we, jk_logger_t *l)
+ jk_worker_env_t *we, jk_log_context_t *l)
{
int rc;
JK_TRACE_ENTER(l);
@@ -40,7 +40,7 @@ static int JK_METHOD validate(jk_worker_t *pThis,
static int JK_METHOD init(jk_worker_t *pThis,
jk_map_t *props,
- jk_worker_env_t *we, jk_logger_t *l)
+ jk_worker_env_t *we, jk_log_context_t *l)
{
int rc;
JK_TRACE_ENTER(l);
@@ -51,7 +51,7 @@ static int JK_METHOD init(jk_worker_t *pThis,
}
-static int JK_METHOD destroy(jk_worker_t **pThis, jk_logger_t *l)
+static int JK_METHOD destroy(jk_worker_t **pThis, jk_log_context_t *l)
{
int rc;
JK_TRACE_ENTER(l);
@@ -62,7 +62,7 @@ static int JK_METHOD destroy(jk_worker_t **pThis, jk_logger_t
*l)
static int JK_METHOD get_endpoint(jk_worker_t *pThis,
- jk_endpoint_t **pend, jk_logger_t *l)
+ jk_endpoint_t **pend, jk_log_context_t *l)
{
int rc;
JK_TRACE_ENTER(l);
@@ -72,7 +72,7 @@ static int JK_METHOD get_endpoint(jk_worker_t *pThis,
}
int JK_METHOD ajp13_worker_factory(jk_worker_t **w,
- const char *name, jk_logger_t *l)
+ const char *name, jk_log_context_t *l)
{
ajp_worker_t *aw;
diff --git a/native/common/jk_ajp14.c b/native/common/jk_ajp14.c
index 2d58c0260..8b504ed78 100644
--- a/native/common/jk_ajp14.c
+++ b/native/common/jk_ajp14.c
@@ -31,7 +31,7 @@
* Compute the MD5 with ENTROPY / SECRET KEY
*/
-void ajp14_compute_md5(jk_login_service_t *s, jk_logger_t *l)
+void ajp14_compute_md5(jk_login_service_t *s, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
jk_md5((const unsigned char *)s->entropy,
@@ -54,7 +54,7 @@ void ajp14_compute_md5(jk_login_service_t *s, jk_logger_t *l)
*/
int ajp14_marshal_login_init_into_msgb(jk_msg_buf_t *msg,
- jk_login_service_t *s, jk_logger_t *l)
+ jk_login_service_t *s, jk_log_context_t
*l)
{
JK_TRACE_ENTER(l);
/* To be on the safe side */
@@ -99,7 +99,7 @@ int ajp14_marshal_login_init_into_msgb(jk_msg_buf_t *msg,
*/
int ajp14_unmarshal_login_seed(jk_msg_buf_t *msg,
- jk_login_service_t *s, jk_logger_t *l)
+ jk_login_service_t *s, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -126,7 +126,7 @@ int ajp14_unmarshal_login_seed(jk_msg_buf_t *msg,
*/
int ajp14_marshal_login_comp_into_msgb(jk_msg_buf_t *msg,
- jk_login_service_t *s, jk_logger_t *l)
+ jk_login_service_t *s, jk_log_context_t
*l)
{
JK_TRACE_ENTER(l);
@@ -167,7 +167,7 @@ int ajp14_marshal_login_comp_into_msgb(jk_msg_buf_t *msg,
*/
int ajp14_unmarshal_log_ok(jk_msg_buf_t *msg,
- jk_login_service_t *s, jk_logger_t *l)
+ jk_login_service_t *s, jk_log_context_t *l)
{
unsigned long nego;
char *sname;
@@ -218,7 +218,7 @@ int ajp14_unmarshal_log_ok(jk_msg_buf_t *msg,
*
*/
-int ajp14_unmarshal_log_nok(jk_msg_buf_t *msg, jk_logger_t *l)
+int ajp14_unmarshal_log_nok(jk_msg_buf_t *msg, jk_log_context_t *l)
{
unsigned long status;
@@ -250,7 +250,7 @@ int ajp14_unmarshal_log_nok(jk_msg_buf_t *msg, jk_logger_t
*l)
*/
int ajp14_marshal_shutdown_into_msgb(jk_msg_buf_t *msg,
- jk_login_service_t *s, jk_logger_t *l)
+ jk_login_service_t *s, jk_log_context_t
*l)
{
JK_TRACE_ENTER(l);
@@ -289,7 +289,7 @@ int ajp14_marshal_shutdown_into_msgb(jk_msg_buf_t *msg,
* +----------------------+-----------------------+
*
*/
-int ajp14_unmarshal_shutdown_nok(jk_msg_buf_t *msg, jk_logger_t *l)
+int ajp14_unmarshal_shutdown_nok(jk_msg_buf_t *msg, jk_log_context_t *l)
{
unsigned long status;
@@ -319,7 +319,7 @@ int ajp14_unmarshal_shutdown_nok(jk_msg_buf_t *msg,
jk_logger_t *l)
*/
int ajp14_marshal_unknown_packet_into_msgb(jk_msg_buf_t *msg,
- jk_msg_buf_t *unk, jk_logger_t *l)
+ jk_msg_buf_t *unk, jk_log_context_t
*l)
{
JK_TRACE_ENTER(l);
@@ -365,7 +365,7 @@ int ajp14_marshal_unknown_packet_into_msgb(jk_msg_buf_t
*msg,
*/
int ajp14_marshal_context_query_into_msgb(jk_msg_buf_t *msg,
- char *virtual, jk_logger_t *l)
+ char *virtual, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -406,7 +406,7 @@ int ajp14_marshal_context_query_into_msgb(jk_msg_buf_t *msg,
*/
int ajp14_unmarshal_context_info(jk_msg_buf_t *msg,
- jk_context_t *c, jk_logger_t *l)
+ jk_context_t *c, jk_log_context_t *l)
{
char *vname;
char *cname;
@@ -516,7 +516,7 @@ int ajp14_unmarshal_context_info(jk_msg_buf_t *msg,
int ajp14_marshal_context_state_into_msgb(jk_msg_buf_t *msg,
jk_context_t *c,
- char *cname, jk_logger_t *l)
+ char *cname, jk_log_context_t *l)
{
jk_context_item_t *ci;
int i;
@@ -610,7 +610,7 @@ int ajp14_marshal_context_state_into_msgb(jk_msg_buf_t *msg,
*/
int ajp14_unmarshal_context_state_reply(jk_msg_buf_t *msg,
- jk_context_t *c, jk_logger_t *l)
+ jk_context_t *c, jk_log_context_t *l)
{
char *vname;
char *cname;
@@ -683,7 +683,7 @@ int ajp14_unmarshal_context_state_reply(jk_msg_buf_t *msg,
*/
int ajp14_unmarshal_context_update_cmd(jk_msg_buf_t *msg,
- jk_context_t *c, jk_logger_t *l)
+ jk_context_t *c, jk_log_context_t *l)
{
int rc;
JK_TRACE_ENTER(l);
diff --git a/native/common/jk_ajp14_worker.c b/native/common/jk_ajp14_worker.c
index 65a48bc4f..896c01967 100644
--- a/native/common/jk_ajp14_worker.c
+++ b/native/common/jk_ajp14_worker.c
@@ -34,7 +34,7 @@
static int handle_discovery(ajp_endpoint_t * ae,
jk_worker_env_t *we,
- jk_msg_buf_t *msg, jk_logger_t *l)
+ jk_msg_buf_t *msg, jk_log_context_t *l)
{
int cmd;
int i, j;
@@ -140,7 +140,7 @@ static int handle_discovery(ajp_endpoint_t * ae,
*/
static int handle_logon(ajp_endpoint_t * ae,
- jk_msg_buf_t *msg, jk_logger_t *l)
+ jk_msg_buf_t *msg, jk_log_context_t *l)
{
int cmd;
@@ -215,7 +215,7 @@ static int handle_logon(ajp_endpoint_t * ae,
return JK_FALSE;
}
-static int logon(ajp_endpoint_t * ae, jk_logger_t *l)
+static int logon(ajp_endpoint_t * ae, jk_log_context_t *l)
{
jk_pool_t *p = &ae->pool;
jk_msg_buf_t *msg;
@@ -233,7 +233,7 @@ static int logon(ajp_endpoint_t * ae, jk_logger_t *l)
return rc;
}
-static int discovery(ajp_endpoint_t * ae, jk_worker_env_t *we, jk_logger_t *l)
+static int discovery(ajp_endpoint_t * ae, jk_worker_env_t *we,
jk_log_context_t *l)
{
jk_pool_t *p = &ae->pool;
jk_msg_buf_t *msg;
@@ -254,7 +254,7 @@ static int discovery(ajp_endpoint_t * ae, jk_worker_env_t
*we, jk_logger_t *l)
/* -------------------- Method -------------------- */
static int JK_METHOD validate(jk_worker_t *pThis,
jk_map_t *props,
- jk_worker_env_t *we, jk_logger_t *l)
+ jk_worker_env_t *we, jk_log_context_t *l)
{
ajp_worker_t *aw;
const char *secret_key;
@@ -281,7 +281,7 @@ static int JK_METHOD validate(jk_worker_t *pThis,
}
static int JK_METHOD get_endpoint(jk_worker_t *pThis,
- jk_endpoint_t **pend, jk_logger_t *l)
+ jk_endpoint_t **pend, jk_log_context_t *l)
{
int rc;
JK_TRACE_ENTER(l);
@@ -292,7 +292,7 @@ static int JK_METHOD get_endpoint(jk_worker_t *pThis,
static int JK_METHOD init(jk_worker_t *pThis,
jk_map_t *props,
- jk_worker_env_t *we, jk_logger_t *l)
+ jk_worker_env_t *we, jk_log_context_t *l)
{
ajp_worker_t *aw;
ajp_endpoint_t *ae;
@@ -347,7 +347,7 @@ static int JK_METHOD init(jk_worker_t *pThis,
}
-static int JK_METHOD destroy(jk_worker_t **pThis, jk_logger_t *l)
+static int JK_METHOD destroy(jk_worker_t **pThis, jk_log_context_t *l)
{
int rc;
ajp_worker_t *aw = (*pThis)->worker_private;
@@ -365,7 +365,7 @@ static int JK_METHOD destroy(jk_worker_t **pThis,
jk_logger_t *l)
}
int JK_METHOD ajp14_worker_factory(jk_worker_t **w,
- const char *name, jk_logger_t *l)
+ const char *name, jk_log_context_t *l)
{
ajp_worker_t *aw;
diff --git a/native/common/jk_ajp_common.c b/native/common/jk_ajp_common.c
index 8ff86d4ec..947ecc73e 100644
--- a/native/common/jk_ajp_common.c
+++ b/native/common/jk_ajp_common.c
@@ -323,7 +323,7 @@ static int sc_for_req_header(const char *header_name)
/* Return the string representation of the worker state
*/
-const char *jk_ajp_get_state(ajp_worker_t *aw, jk_logger_t *l)
+const char *jk_ajp_get_state(ajp_worker_t *aw, jk_log_context_t *l)
{
return ajp_state_type[aw->s->state];
}
@@ -418,7 +418,7 @@ AJPV13_REQUEST/AJPV14_REQUEST=
static int ajp_marshal_into_msgb(jk_msg_buf_t *msg,
jk_ws_service_t *s,
- jk_logger_t *l, ajp_endpoint_t * ae)
+ jk_log_context_t *l, ajp_endpoint_t * ae)
{
int method;
unsigned int i;
@@ -710,7 +710,7 @@ body_chunk :=
static int ajp_unmarshal_response(jk_msg_buf_t *msg,
jk_res_data_t * d,
- ajp_endpoint_t * ae, jk_logger_t *l)
+ ajp_endpoint_t * ae, jk_log_context_t *l)
{
jk_pool_t *p = &ae->pool;
@@ -809,7 +809,7 @@ static int ajp_unmarshal_response(jk_msg_buf_t *msg,
/*
* Abort endpoint use
*/
-static void ajp_abort_endpoint(ajp_endpoint_t * ae, int shutdown, jk_logger_t
*l)
+static void ajp_abort_endpoint(ajp_endpoint_t * ae, int shutdown,
jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -839,7 +839,7 @@ static void ajp_abort_endpoint(ajp_endpoint_t * ae, int
shutdown, jk_logger_t *l
/*
* Reset the endpoint (clean buf and close socket)
*/
-static void ajp_reset_endpoint(ajp_endpoint_t * ae, jk_logger_t *l)
+static void ajp_reset_endpoint(ajp_endpoint_t * ae, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -857,7 +857,7 @@ static void ajp_reset_endpoint(ajp_endpoint_t * ae,
jk_logger_t *l)
/*
* Close the endpoint (close pool and close socket)
*/
-void ajp_close_endpoint(ajp_endpoint_t * ae, jk_logger_t *l)
+void ajp_close_endpoint(ajp_endpoint_t * ae, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -883,7 +883,7 @@ void ajp_close_endpoint(ajp_endpoint_t * ae, jk_logger_t *l)
* JK_TRUE: success
* @remark Always closes old socket endpoint
*/
-static int ajp_next_connection(ajp_endpoint_t *ae, jk_logger_t *l)
+static int ajp_next_connection(ajp_endpoint_t *ae, jk_log_context_t *l)
{
unsigned int i;
int ret = JK_FALSE;
@@ -930,7 +930,7 @@ static int ajp_next_connection(ajp_endpoint_t *ae,
jk_logger_t *l)
* @remark Always closes socket in case of
* a socket error
*/
-static int ajp_handle_cping_cpong(ajp_endpoint_t * ae, int timeout,
jk_logger_t *l)
+static int ajp_handle_cping_cpong(ajp_endpoint_t * ae, int timeout,
jk_log_context_t *l)
{
int i;
int cmd;
@@ -1041,7 +1041,7 @@ static int ajp_handle_cping_cpong(ajp_endpoint_t * ae,
int timeout, jk_logger_t
* a socket error
* @remark Cares about ae->last_errno
*/
-int ajp_connect_to_endpoint(ajp_endpoint_t * ae, jk_logger_t *l)
+int ajp_connect_to_endpoint(ajp_endpoint_t * ae, jk_log_context_t *l)
{
char buf[64];
int rc = JK_TRUE;
@@ -1108,7 +1108,7 @@ int ajp_connect_to_endpoint(ajp_endpoint_t * ae,
jk_logger_t *l)
/* Syncing config values from shm
*/
-void jk_ajp_pull(ajp_worker_t * aw, int locked, jk_logger_t *l)
+void jk_ajp_pull(ajp_worker_t * aw, int locked, jk_log_context_t *l)
{
int address_change = JK_FALSE;
int port = 0;
@@ -1180,7 +1180,7 @@ void jk_ajp_pull(ajp_worker_t * aw, int locked,
jk_logger_t *l)
/* Syncing config values to shm
*/
-void jk_ajp_push(ajp_worker_t * aw, int locked, jk_logger_t *l)
+void jk_ajp_push(ajp_worker_t * aw, int locked, jk_log_context_t *l)
{
int address_change = JK_FALSE;
@@ -1250,7 +1250,7 @@ void jk_ajp_push(ajp_worker_t * aw, int locked,
jk_logger_t *l)
* @remark Cares about ae->last_errno
*/
int ajp_connection_tcp_send_message(ajp_endpoint_t * ae,
- jk_msg_buf_t *msg, jk_logger_t *l)
+ jk_msg_buf_t *msg, jk_log_context_t *l)
{
int rc;
@@ -1313,7 +1313,7 @@ int ajp_connection_tcp_send_message(ajp_endpoint_t * ae,
* @remark Cares about ae->last_errno
*/
int ajp_connection_tcp_get_message(ajp_endpoint_t * ae,
- jk_msg_buf_t *msg, jk_logger_t *l)
+ jk_msg_buf_t *msg, jk_log_context_t *l)
{
unsigned char head[AJP_HEADER_LEN];
int rc;
@@ -1469,7 +1469,7 @@ int ajp_connection_tcp_get_message(ajp_endpoint_t * ae,
* Socket API doesn't guaranty that all the data will be kept in a
* single read, so we must loop until all awaited data is received
*/
-static int ajp_read_fully_from_server(jk_ws_service_t *s, jk_logger_t *l,
+static int ajp_read_fully_from_server(jk_ws_service_t *s, jk_log_context_t *l,
unsigned char *buf, unsigned int len)
{
unsigned int rdlen = 0;
@@ -1519,7 +1519,7 @@ static int ajp_read_fully_from_server(jk_ws_service_t *s,
jk_logger_t *l,
*/
static int ajp_read_into_msg_buff(ajp_endpoint_t * ae,
jk_ws_service_t *s,
- jk_msg_buf_t *msg, int len, jk_logger_t *l)
+ jk_msg_buf_t *msg, int len, jk_log_context_t
*l)
{
unsigned char *read_buf = msg->buf;
int maxlen;
@@ -1601,7 +1601,7 @@ static int ajp_read_into_msg_buff(ajp_endpoint_t * ae,
*/
static int ajp_send_request(jk_endpoint_t *e,
jk_ws_service_t *s,
- jk_logger_t *l,
+ jk_log_context_t *l,
ajp_endpoint_t * ae, ajp_operation_t * op)
{
int err_conn = 0;
@@ -1912,7 +1912,7 @@ static int ajp_send_request(jk_endpoint_t *e,
static int ajp_process_callback(jk_msg_buf_t *msg,
jk_msg_buf_t *pmsg,
ajp_endpoint_t * ae,
- jk_ws_service_t *s, jk_logger_t *l)
+ jk_ws_service_t *s, jk_log_context_t *l)
{
int code = (int)jk_b_get_byte(msg);
@@ -2192,7 +2192,7 @@ static int ajp_process_callback(jk_msg_buf_t *msg,
*/
static int ajp_get_reply(jk_endpoint_t *e,
jk_ws_service_t *s,
- jk_logger_t *l,
+ jk_log_context_t *l,
ajp_endpoint_t * p, ajp_operation_t * op)
{
/* Don't get header from tomcat yet
@@ -2416,7 +2416,7 @@ static int ajp_get_reply(jk_endpoint_t *e,
return JK_FALSE;
}
-static void ajp_update_stats(jk_endpoint_t *e, ajp_worker_t *aw, int rc,
jk_logger_t *l)
+static void ajp_update_stats(jk_endpoint_t *e, ajp_worker_t *aw, int rc,
jk_log_context_t *l)
{
aw->s->readed += e->rd;
aw->s->transferred += e->wr;
@@ -2474,7 +2474,7 @@ static void ajp_update_stats(jk_endpoint_t *e,
ajp_worker_t *aw, int rc, jk_logg
*/
static int JK_METHOD ajp_service(jk_endpoint_t *e,
jk_ws_service_t *s,
- jk_logger_t *l, int *is_error)
+ jk_log_context_t *l, int *is_error)
{
int i;
int err = JK_TRUE;
@@ -2807,7 +2807,7 @@ static int JK_METHOD ajp_service(jk_endpoint_t *e,
*/
int ajp_validate(jk_worker_t *pThis,
jk_map_t *props,
- jk_worker_env_t *we, jk_logger_t *l, int proto)
+ jk_worker_env_t *we, jk_log_context_t *l, int proto)
{
int port;
const char *host;
@@ -2917,7 +2917,7 @@ int ajp_validate(jk_worker_t *pThis,
return JK_FALSE;
}
-static int ajp_create_endpoint_cache(ajp_worker_t *p, int proto, jk_logger_t
*l)
+static int ajp_create_endpoint_cache(ajp_worker_t *p, int proto,
jk_log_context_t *l)
{
unsigned int i;
time_t now = time(NULL);
@@ -2965,7 +2965,7 @@ static int ajp_create_endpoint_cache(ajp_worker_t *p, int
proto, jk_logger_t *l)
}
int ajp_init(jk_worker_t *pThis,
- jk_map_t *props, jk_worker_env_t *we, jk_logger_t *l, int proto)
+ jk_map_t *props, jk_worker_env_t *we, jk_log_context_t *l, int
proto)
{
int rc = JK_FALSE;
int cache;
@@ -3158,7 +3158,7 @@ int ajp_init(jk_worker_t *pThis,
}
int JK_METHOD ajp_worker_factory(jk_worker_t **w,
- const char *name, jk_logger_t *l)
+ const char *name, jk_log_context_t *l)
{
int rc;
ajp_worker_t *aw;
@@ -3224,7 +3224,7 @@ int JK_METHOD ajp_worker_factory(jk_worker_t **w,
return JK_TRUE;
}
-int ajp_destroy(jk_worker_t **pThis, jk_logger_t *l, int proto)
+int ajp_destroy(jk_worker_t **pThis, jk_log_context_t *l, int proto)
{
JK_TRACE_ENTER(l);
@@ -3264,7 +3264,7 @@ int ajp_destroy(jk_worker_t **pThis, jk_logger_t *l, int
proto)
return JK_FALSE;
}
-int JK_METHOD ajp_done(jk_endpoint_t **e, jk_logger_t *l)
+int JK_METHOD ajp_done(jk_endpoint_t **e, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -3299,7 +3299,7 @@ int JK_METHOD ajp_done(jk_endpoint_t **e, jk_logger_t *l)
}
int ajp_get_endpoint(jk_worker_t *pThis,
- jk_endpoint_t **je, jk_logger_t *l, int proto)
+ jk_endpoint_t **je, jk_log_context_t *l, int proto)
{
JK_TRACE_ENTER(l);
@@ -3383,7 +3383,7 @@ int ajp_get_endpoint(jk_worker_t *pThis,
return JK_FALSE;
}
-int JK_METHOD ajp_maintain(jk_worker_t *pThis, time_t mstarted, int global,
jk_logger_t *l)
+int JK_METHOD ajp_maintain(jk_worker_t *pThis, time_t mstarted, int global,
jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -3506,7 +3506,7 @@ int JK_METHOD ajp_maintain(jk_worker_t *pThis, time_t
mstarted, int global, jk_l
return JK_FALSE;
}
-int JK_METHOD ajp_shutdown(jk_worker_t *pThis, jk_logger_t *l)
+int JK_METHOD ajp_shutdown(jk_worker_t *pThis, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -3550,7 +3550,7 @@ int JK_METHOD ajp_shutdown(jk_worker_t *pThis,
jk_logger_t *l)
}
int ajp_has_endpoint(jk_worker_t *pThis,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
diff --git a/native/common/jk_connect.c b/native/common/jk_connect.c
index f570725b6..d62c242b4 100644
--- a/native/common/jk_connect.c
+++ b/native/common/jk_connect.c
@@ -161,7 +161,7 @@ static int sononblock(jk_sock_t sd)
* 0: success
*/
static int nb_connect(jk_sock_t sd, jk_sockaddr_t *addr, jk_sockaddr_t *source,
- int timeout, jk_logger_t *l)
+ int timeout, jk_log_context_t *l)
{
int rc;
char buf[64];
@@ -243,7 +243,7 @@ static int nb_connect(jk_sock_t sd, jk_sockaddr_t *addr,
jk_sockaddr_t *source,
* 0: success
*/
static int nb_connect(jk_sock_t sd, jk_sockaddr_t *addr, jk_sockaddr_t *source,
- int timeout, jk_logger_t *l) {
+ int timeout, jk_log_context_t *l) {
int rc = 0;
char buf[64];
@@ -310,7 +310,7 @@ static int nb_connect(jk_sock_t sd, jk_sockaddr_t *addr,
jk_sockaddr_t *source,
* 0: success
*/
static int nb_connect(jk_sock_t sd, jk_sockaddr_t *addr, jk_sockaddr_t *source,
- int timeout, jk_logger_t *l)
+ int timeout, jk_log_context_t *l)
{
int rc = 0;
char buf[64];
@@ -397,7 +397,7 @@ void jk_clone_sockaddr(jk_sockaddr_t *out, jk_sockaddr_t
*in)
* JK_TRUE: success
*/
int jk_resolve(const char *host, int port, jk_sockaddr_t *saddr,
- void *pool, int prefer_ipv6, jk_logger_t *l)
+ void *pool, int prefer_ipv6, jk_log_context_t *l)
{
int family = JK_INET;
struct in_addr iaddr;
@@ -614,7 +614,7 @@ int jk_resolve(const char *host, int port, jk_sockaddr_t
*saddr,
jk_sock_t jk_open_socket(jk_sockaddr_t *addr, jk_sockaddr_t *source,
int keepalive,
int timeout, int connect_timeout,
- int sock_buf, jk_logger_t *l)
+ int sock_buf, jk_log_context_t *l)
{
char buf[DUMP_SINFO_BUF_SZ];
jk_sock_t sd;
@@ -835,7 +835,7 @@ iSeries when Unix98 is required at compile time */
* 0: success
* @remark Does not change errno
*/
-int jk_close_socket(jk_sock_t sd, jk_logger_t *l)
+int jk_close_socket(jk_sock_t sd, jk_log_context_t *l)
{
int rc;
int save_errno;
@@ -905,7 +905,7 @@ int jk_close_socket(jk_sock_t sd, jk_logger_t *l)
* 0: success
* @remark Does not change errno
*/
-int jk_shutdown_socket(jk_sock_t sd, jk_logger_t *l)
+int jk_shutdown_socket(jk_sock_t sd, jk_log_context_t *l)
{
char dummy[512];
char buf[DUMP_SINFO_BUF_SZ];
@@ -1033,7 +1033,7 @@ int jk_shutdown_socket(jk_sock_t sd, jk_logger_t *l)
* @bug this fails on Unixes if len is too big for the underlying
* protocol
*/
-int jk_tcp_socket_sendfull(jk_sock_t sd, const unsigned char *b, int len,
jk_logger_t *l)
+int jk_tcp_socket_sendfull(jk_sock_t sd, const unsigned char *b, int len,
jk_log_context_t *l)
{
int sent = 0;
int wr;
@@ -1084,7 +1084,7 @@ int jk_tcp_socket_sendfull(jk_sock_t sd, const unsigned
char *b, int len, jk_log
* @remark Always closes socket in case of error
* @remark Cares about errno
*/
-int jk_tcp_socket_recvfull(jk_sock_t sd, unsigned char *b, int len,
jk_logger_t *l)
+int jk_tcp_socket_recvfull(jk_sock_t sd, unsigned char *b, int len,
jk_log_context_t *l)
{
int rdlen = 0;
int rd;
@@ -1365,7 +1365,7 @@ char *jk_dump_sinfo(jk_sock_t sd, char *buf, size_t size)
* @remark Cares about errno
*/
#ifdef HAVE_POLL
-int jk_is_input_event(jk_sock_t sd, int timeout, jk_logger_t *l)
+int jk_is_input_event(jk_sock_t sd, int timeout, jk_log_context_t *l)
{
struct pollfd fds;
int rc;
@@ -1421,7 +1421,7 @@ int jk_is_input_event(jk_sock_t sd, int timeout,
jk_logger_t *l)
return JK_TRUE;
}
#else
-int jk_is_input_event(jk_sock_t sd, int timeout, jk_logger_t *l)
+int jk_is_input_event(jk_sock_t sd, int timeout, jk_log_context_t *l)
{
fd_set rset;
struct timeval tv;
@@ -1482,7 +1482,7 @@ int jk_is_input_event(jk_sock_t sd, int timeout,
jk_logger_t *l)
* @remark Cares about errno
*/
#ifdef HAVE_POLL
-int jk_is_socket_connected(jk_sock_t sd, jk_logger_t *l)
+int jk_is_socket_connected(jk_sock_t sd, jk_log_context_t *l)
{
struct pollfd fds;
int rc;
@@ -1520,7 +1520,7 @@ int jk_is_socket_connected(jk_sock_t sd, jk_logger_t *l)
}
#else
-int jk_is_socket_connected(jk_sock_t sd, jk_logger_t *l)
+int jk_is_socket_connected(jk_sock_t sd, jk_log_context_t *l)
{
fd_set fd;
struct timeval tv;
diff --git a/native/common/jk_lb_worker.c b/native/common/jk_lb_worker.c
index 7e003a9cc..e23aba03d 100644
--- a/native/common/jk_lb_worker.c
+++ b/native/common/jk_lb_worker.c
@@ -149,14 +149,14 @@ static jk_uint64_t scm(jk_uint64_t a, jk_uint64_t b)
/* Return the string representation of the lb lock type */
/* based on the integer representation */
-const char *jk_lb_get_lock_direct(int lblock, jk_logger_t *l)
+const char *jk_lb_get_lock_direct(int lblock, jk_log_context_t *l)
{
return lb_locking_type[lblock];
}
/* Return the string representation of the lb lock type */
/* based on the lb worker struct */
-const char *jk_lb_get_lock(lb_worker_t *p, jk_logger_t *l)
+const char *jk_lb_get_lock(lb_worker_t *p, jk_log_context_t *l)
{
return lb_locking_type[p->lblock];
}
@@ -175,14 +175,14 @@ int jk_lb_get_lock_code(const char *v)
/* Return the string representation of the lb method type */
/* based on the integer representation */
-const char *jk_lb_get_method_direct(int lbmethod, jk_logger_t *l)
+const char *jk_lb_get_method_direct(int lbmethod, jk_log_context_t *l)
{
return lb_method_type[lbmethod];
}
/* Return the string representation of the lb method type */
/* based on the lb worker struct */
-const char *jk_lb_get_method(lb_worker_t *p, jk_logger_t *l)
+const char *jk_lb_get_method(lb_worker_t *p, jk_log_context_t *l)
{
return lb_method_type[p->lbmethod];
}
@@ -207,14 +207,14 @@ int jk_lb_get_method_code(const char *v)
/* Return the string representation of the balance worker state */
/* based on the integer representation */
-const char *jk_lb_get_state_direct(int state, jk_logger_t *l)
+const char *jk_lb_get_state_direct(int state, jk_log_context_t *l)
{
return lb_state_type[state];
}
/* Return the string representation of the balance worker state */
/* based on the sub worker struct */
-const char *jk_lb_get_state(lb_sub_worker_t *p, jk_logger_t *l)
+const char *jk_lb_get_state(lb_sub_worker_t *p, jk_log_context_t *l)
{
return lb_state_type[p->s->state];
}
@@ -243,14 +243,14 @@ int jk_lb_get_state_code(const char *v)
/* Return the string representation of the balance worker activation */
/* based on the integer representation */
-const char *jk_lb_get_activation_direct(int activation, jk_logger_t *l)
+const char *jk_lb_get_activation_direct(int activation, jk_log_context_t *l)
{
return lb_activation_type[activation];
}
/* Return the string representation of the balance worker activation */
/* based on the sub worker struct */
-const char *jk_lb_get_activation(lb_sub_worker_t *p, jk_logger_t *l)
+const char *jk_lb_get_activation(lb_sub_worker_t *p, jk_log_context_t *l)
{
return lb_activation_type[p->activation];
}
@@ -269,7 +269,7 @@ int jk_lb_get_activation_code(const char *v)
}
/* Update the load multipliers wrt. lb_factor */
-void update_mult(lb_worker_t *p, jk_logger_t *l)
+void update_mult(lb_worker_t *p, jk_log_context_t *l)
{
unsigned int i = 0;
jk_uint64_t s = 1;
@@ -291,7 +291,7 @@ void update_mult(lb_worker_t *p, jk_logger_t *l)
/* Reset all lb values.
*/
-void reset_lb_values(lb_worker_t *p, jk_logger_t *l)
+void reset_lb_values(lb_worker_t *p, jk_log_context_t *l)
{
unsigned int i = 0;
JK_TRACE_ENTER(l);
@@ -303,7 +303,7 @@ void reset_lb_values(lb_worker_t *p, jk_logger_t *l)
JK_TRACE_EXIT(l);
}
-static void jk_lb_pull_worker(lb_worker_t *p, int i, jk_logger_t *l)
+static void jk_lb_pull_worker(lb_worker_t *p, int i, jk_log_context_t *l)
{
lb_sub_worker_t *w = &p->lb_workers[i];
if (w->sequence < w->s->h.sequence) {
@@ -328,7 +328,7 @@ static void jk_lb_pull_worker(lb_worker_t *p, int i,
jk_logger_t *l)
}
/* Syncing config values from shm */
-void jk_lb_pull(lb_worker_t *p, int locked, jk_logger_t *l)
+void jk_lb_pull(lb_worker_t *p, int locked, jk_log_context_t *l)
{
unsigned int i = 0;
@@ -367,7 +367,7 @@ void jk_lb_pull(lb_worker_t *p, int locked, jk_logger_t *l)
}
/* Syncing config values to shm */
-void jk_lb_push(lb_worker_t *p, int locked, int push_all_members, jk_logger_t
*l)
+void jk_lb_push(lb_worker_t *p, int locked, int push_all_members,
jk_log_context_t *l)
{
unsigned int i = 0;
@@ -528,7 +528,7 @@ static char *get_cookie(jk_ws_service_t *s, const char
*name)
/* Retrieve session id from the cookie or the parameter
* (parameter first)
*/
-static char *get_sessionid(jk_ws_service_t *s, lb_worker_t *p, jk_logger_t *l)
+static char *get_sessionid(jk_ws_service_t *s, lb_worker_t *p,
jk_log_context_t *l)
{
char *val;
char *session_path;
@@ -568,7 +568,7 @@ static char *get_sessionid(jk_ws_service_t *s, lb_worker_t
*p, jk_logger_t *l)
return val;
}
-static void close_workers(lb_worker_t *p, int num_of_workers, jk_logger_t *l)
+static void close_workers(lb_worker_t *p, int num_of_workers, jk_log_context_t
*l)
{
int i = 0;
for (i = 0; i < num_of_workers; i++) {
@@ -589,7 +589,7 @@ static void close_workers(lb_worker_t *p, int
num_of_workers, jk_logger_t *l)
static int recover_workers(lb_worker_t *p,
jk_uint64_t curmax,
time_t now,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
unsigned int i;
int non_error = 0;
@@ -647,7 +647,7 @@ static int recover_workers(lb_worker_t *p,
static int force_recovery(lb_worker_t *p,
int *states,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
unsigned int i;
int forced = 0;
@@ -681,7 +681,7 @@ static int force_recovery(lb_worker_t *p,
*/
static jk_uint64_t decay_load(lb_worker_t *p,
time_t exponent,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
unsigned int i;
jk_uint64_t curmax = 0;
@@ -731,7 +731,7 @@ static jk_uint64_t decay_load(lb_worker_t *p,
return curmax;
}
-static int JK_METHOD maintain_workers(jk_worker_t *p, time_t now, int global,
jk_logger_t *l)
+static int JK_METHOD maintain_workers(jk_worker_t *p, time_t now, int global,
jk_log_context_t *l)
{
unsigned int i = 0;
jk_uint64_t curmax = 0;
@@ -793,7 +793,7 @@ static int JK_METHOD maintain_workers(jk_worker_t *p,
time_t now, int global, jk
return JK_TRUE;
}
-static int JK_METHOD shutdown_workers(jk_worker_t *p, jk_logger_t *l)
+static int JK_METHOD shutdown_workers(jk_worker_t *p, jk_log_context_t *l)
{
unsigned int i = 0;
@@ -819,7 +819,7 @@ static int JK_METHOD shutdown_workers(jk_worker_t *p,
jk_logger_t *l)
static int find_by_session(jk_ws_service_t *s,
lb_worker_t *p,
const char *session_route,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int rc = -1;
@@ -838,7 +838,7 @@ static int find_best_bydomain(jk_ws_service_t *s,
lb_worker_t *p,
const char *route_or_domain,
int *states,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
unsigned int i;
int d = 0;
@@ -888,7 +888,7 @@ static int find_best_bydomain(jk_ws_service_t *s,
static int find_best_byvalue(jk_ws_service_t *s,
lb_worker_t *p,
int *states,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
unsigned int i;
unsigned int j;
@@ -935,7 +935,7 @@ static int find_bysession_route(jk_ws_service_t *s,
lb_worker_t *p,
const char *session_route,
int *states,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int uses_domain = 0;
int candidate = -1;
@@ -999,7 +999,7 @@ static int find_bysession_route(jk_ws_service_t *s,
static int find_failover_worker(jk_ws_service_t *s,
lb_worker_t *p,
int *states,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int rc = -1;
unsigned int i;
@@ -1021,7 +1021,7 @@ static int find_failover_worker(jk_ws_service_t *s,
static int find_best_worker(jk_ws_service_t *s,
lb_worker_t *p,
int *states,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int rc = -1;
@@ -1036,7 +1036,7 @@ static int get_most_suitable_worker(jk_ws_service_t *s,
lb_worker_t *p,
char *sessionid,
int *states,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int rc = -1;
@@ -1152,7 +1152,7 @@ static int get_most_suitable_worker(jk_ws_service_t *s,
static void lb_add_log_items(jk_ws_service_t *s,
const char *const *log_names,
lb_sub_worker_t *w,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
/* ADJUST JK_LB_NOTES_COUNT WHEN ADDING MORE NOTES HERE! */
ajp_worker_t *aw = (ajp_worker_t *)w->worker->worker_private;
@@ -1198,7 +1198,7 @@ static void lb_add_log_items(jk_ws_service_t *s,
static int JK_METHOD service(jk_endpoint_t *e,
jk_ws_service_t *s,
- jk_logger_t *l, int *is_error)
+ jk_log_context_t *l, int *is_error)
{
lb_endpoint_t *p;
int attempt = 0;
@@ -1695,7 +1695,7 @@ static int JK_METHOD service(jk_endpoint_t *e,
return rc;
}
-static int JK_METHOD done(jk_endpoint_t **e, jk_logger_t *l)
+static int JK_METHOD done(jk_endpoint_t **e, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -1715,7 +1715,7 @@ static int JK_METHOD done(jk_endpoint_t **e, jk_logger_t
*l)
static int JK_METHOD validate(jk_worker_t *pThis,
jk_map_t *props,
- jk_worker_env_t *we, jk_logger_t *l)
+ jk_worker_env_t *we, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -1904,7 +1904,7 @@ static int JK_METHOD validate(jk_worker_t *pThis,
static int JK_METHOD init(jk_worker_t *pThis,
jk_map_t *props,
- jk_worker_env_t *we, jk_logger_t *log)
+ jk_worker_env_t *we, jk_log_context_t *log)
{
int i;
const char *s;
@@ -1986,7 +1986,7 @@ static int JK_METHOD init(jk_worker_t *pThis,
}
static int JK_METHOD get_endpoint(jk_worker_t *pThis,
- jk_endpoint_t **pend, jk_logger_t *l)
+ jk_endpoint_t **pend, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -2016,7 +2016,7 @@ static int JK_METHOD get_endpoint(jk_worker_t *pThis,
return JK_FALSE;
}
-static int JK_METHOD destroy(jk_worker_t **pThis, jk_logger_t *l)
+static int JK_METHOD destroy(jk_worker_t **pThis, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -2038,7 +2038,7 @@ static int JK_METHOD destroy(jk_worker_t **pThis,
jk_logger_t *l)
}
int JK_METHOD lb_worker_factory(jk_worker_t **w,
- const char *name, jk_logger_t *l)
+ const char *name, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
diff --git a/native/common/jk_map.c b/native/common/jk_map.c
index 5b378116e..8c6de4240 100644
--- a/native/common/jk_map.c
+++ b/native/common/jk_map.c
@@ -406,7 +406,7 @@ int jk_map_put(jk_map_t *m, const char *name, const void
*value, void **old)
}
-static int jk_map_validate_property(char *prp, jk_logger_t *l)
+static int jk_map_validate_property(char *prp, jk_log_context_t *l)
{
/* check the worker properties */
if (!jk_is_valid_property(prp)) {
@@ -426,7 +426,7 @@ static int jk_map_validate_property(char *prp, jk_logger_t
*l)
}
static int jk_map_handle_duplicates(jk_map_t *m, const char *prp, char **v,
- int treatment, jk_logger_t *l)
+ int treatment, jk_log_context_t *l)
{
const char *oldv = jk_map_get_string(m, prp, NULL);
if (oldv) {
@@ -465,7 +465,7 @@ static int jk_map_handle_duplicates(jk_map_t *m, const char
*prp, char **v,
}
int jk_map_read_property(jk_map_t *m, jk_map_t *env, const char *str,
- int treatment, jk_logger_t *l)
+ int treatment, jk_log_context_t *l)
{
int rc = JK_TRUE;
char buf[LENGTH_OF_LINE + 1];
@@ -514,7 +514,7 @@ int jk_map_read_property(jk_map_t *m, jk_map_t *env, const
char *str,
int jk_map_read_properties(jk_map_t *m, jk_map_t *env, const char *f, time_t
*modified,
- int treatment, jk_logger_t *l)
+ int treatment, jk_log_context_t *l)
{
int rc = JK_FALSE;
@@ -579,7 +579,7 @@ void *jk_map_value_at(jk_map_t *m, int idex)
return NULL;
}
-void jk_map_dump(jk_map_t *m, jk_logger_t *l)
+void jk_map_dump(jk_map_t *m, jk_log_context_t *l)
{
if (m) {
int s = jk_map_size(m);
@@ -767,7 +767,7 @@ static char *jk_map_replace_properties(jk_map_t *m,
jk_map_t *env, char *value)
*
*/
int jk_map_resolve_references(jk_map_t *m, const char *prefix,
- int wildcard, int depth, jk_logger_t *l)
+ int wildcard, int depth, jk_log_context_t *l)
{
int rc = JK_FALSE;
@@ -843,7 +843,7 @@ int jk_map_resolve_references(jk_map_t *m, const char
*prefix,
* Inherit properties
*
*/
-int jk_map_inherit_properties(jk_map_t *m, const char *from, const char *to,
jk_logger_t *l)
+int jk_map_inherit_properties(jk_map_t *m, const char *from, const char *to,
jk_log_context_t *l)
{
int rc = JK_FALSE;
const char *prp;
diff --git a/native/common/jk_msg_buff.c b/native/common/jk_msg_buff.c
index 10ab9d3df..2e02928af 100644
--- a/native/common/jk_msg_buff.c
+++ b/native/common/jk_msg_buff.c
@@ -306,7 +306,7 @@ int jk_b_get_bytes(jk_msg_buf_t *msg, unsigned char *buf,
int len)
/** Helpie dump function
*/
-void jk_dump_buff(jk_logger_t *l,
+void jk_dump_buff(jk_log_context_t *l,
const char *file,
int line, const char *funcname,
int level, char *what, jk_msg_buf_t *msg)
diff --git a/native/common/jk_shm.c b/native/common/jk_shm.c
index d4281ecfa..784aa4250 100644
--- a/native/common/jk_shm.c
+++ b/native/common/jk_shm.c
@@ -118,7 +118,7 @@ static size_t jk_shm_calculate_slot_size()
}
/* Calculate needed shm size */
-int jk_shm_calculate_size(jk_map_t *init_data, jk_logger_t *l)
+int jk_shm_calculate_size(jk_map_t *init_data, jk_log_context_t *l)
{
char **worker_list;
size_t needed_slot_size = 0;
@@ -190,7 +190,7 @@ int jk_shm_calculate_size(jk_map_t *init_data, jk_logger_t
*l)
#if defined (WIN32)
/* Use plain memory */
-int jk_shm_open(const char *fname, int sz, jk_logger_t *l)
+int jk_shm_open(const char *fname, int sz, jk_log_context_t *l)
{
int rc = -1;
int attached = 0;
@@ -369,7 +369,7 @@ int jk_shm_open(const char *fname, int sz, jk_logger_t *l)
return 0;
}
-int jk_shm_attach(const char *fname, int sz, jk_logger_t *l)
+int jk_shm_attach(const char *fname, int sz, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
if (!jk_shm_open(fname, sz, l)) {
@@ -392,7 +392,7 @@ int jk_shm_attach(const char *fname, int sz, jk_logger_t *l)
}
}
-void jk_shm_close(jk_logger_t *l)
+void jk_shm_close(jk_log_context_t *l)
{
if (jk_shm_inited_cs) {
JK_ENTER_CS(&jk_shmem.cs);
@@ -447,7 +447,7 @@ void jk_shm_close(jk_logger_t *l)
#define MAP_FILE (0)
#endif
-static int do_shm_open_lock(const char *fname, int attached, jk_logger_t *l)
+static int do_shm_open_lock(const char *fname, int attached, jk_log_context_t
*l)
{
int rc;
char flkname[256];
@@ -535,7 +535,7 @@ static int do_shm_open_lock(const char *fname, int
attached, jk_logger_t *l)
}
static int do_shm_open(const char *fname, int attached,
- int sz, jk_logger_t *l)
+ int sz, jk_log_context_t *l)
{
int rc;
int fd;
@@ -723,17 +723,17 @@ static int do_shm_open(const char *fname, int attached,
return 0;
}
-int jk_shm_open(const char *fname, int sz, jk_logger_t *l)
+int jk_shm_open(const char *fname, int sz, jk_log_context_t *l)
{
return do_shm_open(fname, 0, sz, l);
}
-int jk_shm_attach(const char *fname, int sz, jk_logger_t *l)
+int jk_shm_attach(const char *fname, int sz, jk_log_context_t *l)
{
return do_shm_open(fname, 1, sz, l);
}
-void jk_shm_close(jk_logger_t *l)
+void jk_shm_close(jk_log_context_t *l)
{
#ifdef AS400_UTF8
char *wptr;
@@ -808,7 +808,7 @@ void jk_shm_close(jk_logger_t *l)
jk_shm_worker_header_t *jk_shm_alloc_worker(jk_pool_t *p, int type,
int parent_id, const char *name,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
unsigned int i;
jk_shm_worker_header_t *w = 0;
@@ -925,21 +925,21 @@ int jk_shm_unlock()
}
jk_shm_ajp_worker_t *jk_shm_alloc_ajp_worker(jk_pool_t *p, const char *name,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
return (jk_shm_ajp_worker_t *)jk_shm_alloc_worker(p,
JK_AJP13_WORKER_TYPE, 0, name, l);
}
jk_shm_lb_sub_worker_t *jk_shm_alloc_lb_sub_worker(jk_pool_t *p, int lb_id,
const char *name,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
return (jk_shm_lb_sub_worker_t *)jk_shm_alloc_worker(p,
JK_LB_SUB_WORKER_TYPE, lb_id, name, l);
}
jk_shm_lb_worker_t *jk_shm_alloc_lb_worker(jk_pool_t *p, const char *name,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
return (jk_shm_lb_worker_t *)jk_shm_alloc_worker(p,
JK_LB_WORKER_TYPE, 0, name, l);
diff --git a/native/common/jk_status.c b/native/common/jk_status.c
index c21b8fcb8..f051d041a 100644
--- a/native/common/jk_status.c
+++ b/native/common/jk_status.c
@@ -534,7 +534,7 @@ static void jk_putv(jk_ws_service_t *s, ...)
va_end(va);
}
-static int jk_printf(jk_ws_service_t *s, jk_logger_t *l, const char *fmt, ...)
+static int jk_printf(jk_ws_service_t *s, jk_log_context_t *l, const char *fmt,
...)
{
int rc = 0;
va_list args;
@@ -555,7 +555,7 @@ static int jk_printf(jk_ws_service_t *s, jk_logger_t *l,
const char *fmt, ...)
return rc;
}
-static void jk_print_xml_start_elt(jk_ws_service_t *s, jk_logger_t *l,
status_worker_t *w,
+static void jk_print_xml_start_elt(jk_ws_service_t *s, jk_log_context_t *l,
status_worker_t *w,
int indentation, int close_tag,
const char *name)
{
@@ -567,14 +567,14 @@ static void jk_print_xml_start_elt(jk_ws_service_t *s,
jk_logger_t *l, status_wo
}
}
-static void jk_print_xml_close_elt(jk_ws_service_t *s, jk_logger_t *l,
status_worker_t *w,
+static void jk_print_xml_close_elt(jk_ws_service_t *s, jk_log_context_t *l,
status_worker_t *w,
int indentation,
const char *name)
{
jk_printf(s, l, "%*s</%s%s>\n", indentation, "", w->ns, name);
}
-static void jk_print_xml_stop_elt(jk_ws_service_t *s, jk_logger_t *l,
+static void jk_print_xml_stop_elt(jk_ws_service_t *s, jk_log_context_t *l,
int indentation, int close_tag)
{
if (close_tag) {
@@ -585,49 +585,49 @@ static void jk_print_xml_stop_elt(jk_ws_service_t *s,
jk_logger_t *l,
}
}
-static void jk_print_xml_att_string(jk_ws_service_t *s, jk_logger_t *l,
+static void jk_print_xml_att_string(jk_ws_service_t *s, jk_log_context_t *l,
int indentation,
const char *key, const char *value)
{
jk_printf(s, l, "%*s%s=\"%s\"\n", indentation, "", key, value ? value :
"");
}
-static void jk_print_xml_att_int(jk_ws_service_t *s, jk_logger_t *l,
+static void jk_print_xml_att_int(jk_ws_service_t *s, jk_log_context_t *l,
int indentation,
const char *key, int value)
{
jk_printf(s, l, "%*s%s=\"%d\"\n", indentation, "", key, value);
}
-static void jk_print_xml_att_uint(jk_ws_service_t *s, jk_logger_t *l,
+static void jk_print_xml_att_uint(jk_ws_service_t *s, jk_log_context_t *l,
int indentation,
const char *key, unsigned int value)
{
jk_printf(s, l, "%*s%s=\"%u\"\n", indentation, "", key, value);
}
-static void jk_print_xml_att_long(jk_ws_service_t *s, jk_logger_t *l,
+static void jk_print_xml_att_long(jk_ws_service_t *s, jk_log_context_t *l,
int indentation,
const char *key, long value)
{
jk_printf(s, l, "%*s%s=\"%ld\"\n", indentation, "", key, value);
}
-static void jk_print_xml_att_uint32(jk_ws_service_t *s, jk_logger_t *l,
+static void jk_print_xml_att_uint32(jk_ws_service_t *s, jk_log_context_t *l,
int indentation,
const char *key, jk_uint32_t value)
{
jk_printf(s, l, "%*s%s=\"%" JK_UINT32_T_FMT "\"\n", indentation, "", key,
value);
}
-static void jk_print_xml_att_uint64(jk_ws_service_t *s, jk_logger_t *l,
+static void jk_print_xml_att_uint64(jk_ws_service_t *s, jk_log_context_t *l,
int indentation,
const char *key, jk_uint64_t value)
{
jk_printf(s, l, "%*s%s=\"%" JK_UINT64_T_FMT "\"\n", indentation, "", key,
value);
}
-static void jk_print_prop_att_string(jk_ws_service_t *s, jk_logger_t *l,
status_worker_t *w,
+static void jk_print_prop_att_string(jk_ws_service_t *s, jk_log_context_t *l,
status_worker_t *w,
const char *name,
const char *key, const char *value)
{
@@ -639,7 +639,7 @@ static void jk_print_prop_att_string(jk_ws_service_t *s,
jk_logger_t *l, status_
}
}
-static void jk_print_prop_att_int(jk_ws_service_t *s, jk_logger_t *l,
status_worker_t *w,
+static void jk_print_prop_att_int(jk_ws_service_t *s, jk_log_context_t *l,
status_worker_t *w,
const char *name,
const char *key, int value)
{
@@ -651,7 +651,7 @@ static void jk_print_prop_att_int(jk_ws_service_t *s,
jk_logger_t *l, status_wor
}
}
-static void jk_print_prop_att_uint(jk_ws_service_t *s, jk_logger_t *l,
status_worker_t *w,
+static void jk_print_prop_att_uint(jk_ws_service_t *s, jk_log_context_t *l,
status_worker_t *w,
const char *name,
const char *key, unsigned int value)
{
@@ -663,7 +663,7 @@ static void jk_print_prop_att_uint(jk_ws_service_t *s,
jk_logger_t *l, status_wo
}
}
-static void jk_print_prop_att_long(jk_ws_service_t *s, jk_logger_t *l,
status_worker_t *w,
+static void jk_print_prop_att_long(jk_ws_service_t *s, jk_log_context_t *l,
status_worker_t *w,
const char *name,
const char *key, long value)
{
@@ -675,7 +675,7 @@ static void jk_print_prop_att_long(jk_ws_service_t *s,
jk_logger_t *l, status_wo
}
}
-static void jk_print_prop_att_uint32(jk_ws_service_t *s, jk_logger_t *l,
status_worker_t *w,
+static void jk_print_prop_att_uint32(jk_ws_service_t *s, jk_log_context_t *l,
status_worker_t *w,
const char *name,
const char *key, jk_uint32_t value)
{
@@ -687,7 +687,7 @@ static void jk_print_prop_att_uint32(jk_ws_service_t *s,
jk_logger_t *l, status_
}
}
-static void jk_print_prop_att_uint64(jk_ws_service_t *s, jk_logger_t *l,
status_worker_t *w,
+static void jk_print_prop_att_uint64(jk_ws_service_t *s, jk_log_context_t *l,
status_worker_t *w,
const char *name,
const char *key, jk_uint64_t value)
{
@@ -699,7 +699,7 @@ static void jk_print_prop_att_uint64(jk_ws_service_t *s,
jk_logger_t *l, status_
}
}
-static void jk_print_prop_item_int(jk_ws_service_t *s, jk_logger_t *l,
status_worker_t *w,
+static void jk_print_prop_item_int(jk_ws_service_t *s, jk_log_context_t *l,
status_worker_t *w,
const char *name, const char *list, int num,
const char *key, int value)
{
@@ -711,7 +711,7 @@ static void jk_print_prop_item_int(jk_ws_service_t *s,
jk_logger_t *l, status_wo
}
}
-static void jk_print_prop_item_string(jk_ws_service_t *s, jk_logger_t *l,
status_worker_t *w,
+static void jk_print_prop_item_string(jk_ws_service_t *s, jk_log_context_t *l,
status_worker_t *w,
const char *name, const char *list, int
num,
const char *key, const char *value)
{
@@ -797,7 +797,7 @@ static const char *windows_strftime_preprocess(const char
*pattern,
#endif
static int status_strftime(time_t clock, int mime, char *buf_time, char
*buf_tz,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
size_t rc_time;
#ifdef WIN32
@@ -835,7 +835,7 @@ static int status_strftime(time_t clock, int mime, char
*buf_time, char *buf_tz,
}
static int status_rate(lb_sub_worker_t *wr, status_worker_t *w,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
jk_uint32_t mask = 0;
int activation = wr->activation;
@@ -903,7 +903,7 @@ static int status_rate(lb_sub_worker_t *wr, status_worker_t
*w,
return rv;
}
-static jk_uint32_t status_get_single_rating(const char rating, jk_logger_t *l)
+static jk_uint32_t status_get_single_rating(const char rating,
jk_log_context_t *l)
{
if (JK_IS_DEBUG_LEVEL(l))
jk_log(l, JK_LOG_DEBUG,
@@ -946,7 +946,7 @@ static jk_uint32_t status_get_single_rating(const char
rating, jk_logger_t *l)
}
static jk_uint32_t status_get_rating(const char *rating,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int off = 0;
jk_uint32_t mask = 0;
@@ -983,7 +983,7 @@ static int status_get_string(status_endpoint_t *p,
const char *param,
const char *def,
const char **result,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int rv;
@@ -1007,7 +1007,7 @@ static int status_get_string(status_endpoint_t *p,
static int status_get_int(status_endpoint_t *p,
const char *param,
int def,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
const char *arg;
int rv = def;
@@ -1021,7 +1021,7 @@ static int status_get_int(status_endpoint_t *p,
static int status_get_bool(status_endpoint_t *p,
const char *param,
int def,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
const char *arg;
@@ -1128,7 +1128,7 @@ static void status_start_form(jk_ws_service_t *s,
const char *method,
int cmd,
const char *overwrite,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int i;
@@ -1164,7 +1164,7 @@ static void status_write_uri(jk_ws_service_t *s,
const char *worker, const char *sub_worker,
unsigned int add_options, unsigned int rm_options,
const char *attribute,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int i;
int sz;
@@ -1292,7 +1292,7 @@ static void status_write_uri(jk_ws_service_t *s,
static int status_parse_uri(jk_ws_service_t *s,
status_endpoint_t *p,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
jk_map_t *m;
status_worker_t *w = p->worker;
@@ -1400,7 +1400,7 @@ static int status_parse_uri(jk_ws_service_t *s,
static void write_html_refresh_response(jk_ws_service_t *s,
status_endpoint_t *p,
const char *err,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
if (!err) {
jk_puts(s, "\n<meta http-equiv=\"Refresh\" content=\""
@@ -1417,7 +1417,7 @@ static int fetch_worker_and_sub_worker(status_endpoint_t
*p,
const char *operation,
const char **worker,
const char **sub_worker,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
status_worker_t *w = p->worker;
@@ -1455,7 +1455,7 @@ static int check_valid_lb(jk_ws_service_t *s,
const char *worker,
lb_worker_t **lbp,
int implemented,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
status_worker_t *w = p->worker;
@@ -1494,7 +1494,7 @@ static int search_worker(jk_ws_service_t *s,
status_endpoint_t *p,
jk_worker_t **jwp,
const char *worker,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
status_worker_t *w = p->worker;
@@ -1533,7 +1533,7 @@ static int search_sub_worker(jk_ws_service_t *s,
lb_sub_worker_t **wrp,
const char *sub_worker,
unsigned int *idx,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
lb_worker_t *lb = NULL;
lb_sub_worker_t *wr = NULL;
@@ -1587,7 +1587,7 @@ static int search_sub_worker(jk_ws_service_t *s,
static int count_map(jk_uri_worker_map_t *uw_map,
const char *worker,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
unsigned int i;
int count=0;
@@ -1609,7 +1609,7 @@ static int count_map(jk_uri_worker_map_t *uw_map,
static int count_maps(jk_ws_service_t *s,
const char *worker,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int count=0;
@@ -1633,7 +1633,7 @@ static void display_map(jk_ws_service_t *s,
const char *server_name,
int *count_ptr,
int mime,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
char buf[64];
unsigned int i;
@@ -1742,7 +1742,7 @@ static void display_map(jk_ws_service_t *s,
static void display_maps(jk_ws_service_t *s,
status_endpoint_t *p,
const char *worker,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int mime;
unsigned int hide;
@@ -1838,7 +1838,7 @@ static void
display_worker_ajp_conf_details(jk_ws_service_t *s,
ajp_worker_t *aw,
int is_member,
int type,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
char buf[64];
@@ -1885,7 +1885,7 @@ static void display_worker_ajp_details(jk_ws_service_t *s,
int ms_min,
int ms_max,
int map_count,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
char buf[64];
char buf_rd[32];
@@ -2211,7 +2211,7 @@ static void display_worker_lb(jk_ws_service_t *s,
status_endpoint_t *p,
lb_worker_t *lb,
lb_sub_worker_t *swr,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int cmd;
int mime;
@@ -2625,7 +2625,7 @@ static void display_worker_ajp(jk_ws_service_t *s,
status_endpoint_t *p,
ajp_worker_t *aw,
int type,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int cmd;
int mime;
@@ -2716,7 +2716,7 @@ static void display_worker(jk_ws_service_t *s,
status_endpoint_t *p,
jk_worker_t *jw,
lb_sub_worker_t *swr,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
status_worker_t *w = p->worker;
@@ -2765,7 +2765,7 @@ static void display_worker(jk_ws_service_t *s,
static void form_worker(jk_ws_service_t *s,
status_endpoint_t *p,
jk_worker_t *jw,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
const char *name = NULL;
lb_worker_t *lb = NULL;
@@ -2890,7 +2890,7 @@ static void form_member(jk_ws_service_t *s,
lb_sub_worker_t *wr,
ajp_worker_t *aw,
const char *lb_name,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
status_worker_t *w = p->worker;
@@ -3027,7 +3027,7 @@ static void form_all_members(jk_ws_service_t *s,
status_endpoint_t *p,
jk_worker_t *jw,
const char *attribute,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
const char *name = NULL;
lb_worker_t *lb = NULL;
@@ -3219,7 +3219,7 @@ static void form_all_members(jk_ws_service_t *s,
static void commit_worker(jk_ws_service_t *s,
status_endpoint_t *p,
jk_worker_t *jw,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
const char *name = NULL;
lb_worker_t *lb = NULL;
@@ -3348,7 +3348,7 @@ static int set_int_if_changed(status_endpoint_t *p,
int max,
int *param,
const char *lb_name,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int i;
status_worker_t *w = p->worker;
@@ -3377,7 +3377,7 @@ static int set_uint_if_changed(status_endpoint_t *p,
unsigned int align,
unsigned int *param,
const char *lb_name,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
unsigned i;
status_worker_t *w = p->worker;
@@ -3406,7 +3406,7 @@ static int commit_member(jk_ws_service_t *s,
lb_sub_worker_t *wr,
ajp_worker_t *aw,
int *side_effect,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
const char *arg;
const char *lb_name = NULL;
@@ -3615,7 +3615,7 @@ static void commit_all_members(jk_ws_service_t *s,
status_endpoint_t *p,
jk_worker_t *jw,
const char *attribute,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
const char *arg;
char vname[32];
@@ -3889,7 +3889,7 @@ static void commit_all_members(jk_ws_service_t *s,
static void display_legend(jk_ws_service_t *s,
status_endpoint_t *p,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int mime;
@@ -3958,7 +3958,7 @@ static void display_legend(jk_ws_service_t *s,
static int check_worker(jk_ws_service_t *s,
status_endpoint_t *p,
jk_uint32_t allow_wildchars,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
const char *worker;
const char *sub_worker;
@@ -4004,7 +4004,7 @@ static int check_worker(jk_ws_service_t *s,
static void count_workers(jk_ws_service_t *s,
status_endpoint_t *p,
int *lb_cnt, int *ajp_cnt,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
unsigned int i;
jk_worker_t *jw = NULL;
@@ -4035,7 +4035,7 @@ static void count_workers(jk_ws_service_t *s,
static void list_workers_type(jk_ws_service_t *s,
status_endpoint_t *p,
int list_lb, int count,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
const char *arg;
@@ -4161,7 +4161,7 @@ static void list_workers_type(jk_ws_service_t *s,
static int list_workers(jk_ws_service_t *s,
status_endpoint_t *p,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int lb_cnt = 0;
int ajp_cnt = 0;
@@ -4183,7 +4183,7 @@ static int list_workers(jk_ws_service_t *s,
static int show_worker(jk_ws_service_t *s,
status_endpoint_t *p,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
const char *worker;
const char *sub_worker;
@@ -4211,7 +4211,7 @@ static int show_worker(jk_ws_service_t *s,
static int edit_worker(jk_ws_service_t *s,
status_endpoint_t *p,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
const char *worker;
const char *sub_worker;
@@ -4304,7 +4304,7 @@ static int edit_worker(jk_ws_service_t *s,
static int update_worker(jk_ws_service_t *s,
status_endpoint_t *p,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
const char *worker;
const char *sub_worker;
@@ -4470,7 +4470,7 @@ static int update_worker(jk_ws_service_t *s,
static int reset_worker(jk_ws_service_t *s,
status_endpoint_t *p,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
unsigned int i;
const char *worker;
@@ -4593,7 +4593,7 @@ static int reset_worker(jk_ws_service_t *s,
static int recover_worker(jk_ws_service_t *s,
status_endpoint_t *p,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
const char *worker;
const char *sub_worker;
@@ -4655,7 +4655,7 @@ static int recover_worker(jk_ws_service_t *s,
static int dump_config(jk_ws_service_t *s,
status_endpoint_t *p,
- int mime, jk_logger_t *l)
+ int mime, jk_log_context_t *l)
{
status_worker_t *w = p->worker;
jk_worker_env_t *we = w->we;
@@ -4724,7 +4724,7 @@ static int dump_config(jk_ws_service_t *s,
*/
static int JK_METHOD service(jk_endpoint_t *e,
jk_ws_service_t *s,
- jk_logger_t *l, int *is_error)
+ jk_log_context_t *l, int *is_error)
{
int cmd;
jk_uint32_t cmd_props;
@@ -5247,7 +5247,7 @@ static int JK_METHOD service(jk_endpoint_t *e,
return JK_TRUE;
}
-static int JK_METHOD done(jk_endpoint_t **e, jk_logger_t *l)
+static int JK_METHOD done(jk_endpoint_t **e, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -5268,7 +5268,7 @@ static int JK_METHOD done(jk_endpoint_t **e, jk_logger_t
*l)
static int JK_METHOD validate(jk_worker_t *pThis,
jk_map_t *props,
- jk_worker_env_t *we, jk_logger_t *l)
+ jk_worker_env_t *we, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -5284,7 +5284,7 @@ static int JK_METHOD validate(jk_worker_t *pThis,
static int JK_METHOD init(jk_worker_t *pThis,
jk_map_t *props,
- jk_worker_env_t *we, jk_logger_t *l)
+ jk_worker_env_t *we, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
if (pThis && pThis->worker_private) {
@@ -5375,7 +5375,7 @@ static int JK_METHOD init(jk_worker_t *pThis,
}
static int JK_METHOD get_endpoint(jk_worker_t *pThis,
- jk_endpoint_t **pend, jk_logger_t *l)
+ jk_endpoint_t **pend, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -5400,7 +5400,7 @@ static int JK_METHOD get_endpoint(jk_worker_t *pThis,
return JK_FALSE;
}
-static int JK_METHOD destroy(jk_worker_t **pThis, jk_logger_t *l)
+static int JK_METHOD destroy(jk_worker_t **pThis, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -5420,7 +5420,7 @@ static int JK_METHOD destroy(jk_worker_t **pThis,
jk_logger_t *l)
}
int JK_METHOD status_worker_factory(jk_worker_t **w,
- const char *name, jk_logger_t *l)
+ const char *name, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
diff --git a/native/common/jk_uri_worker_map.c
b/native/common/jk_uri_worker_map.c
index 118c6150f..525bd34f4 100644
--- a/native/common/jk_uri_worker_map.c
+++ b/native/common/jk_uri_worker_map.c
@@ -168,7 +168,7 @@ static void worker_qsort(jk_uri_worker_map_t *uw_map)
/* Dump the map contents - only call if debug log is active. */
static void uri_worker_map_dump(jk_uri_worker_map_t *uw_map,
- const char *reason, jk_logger_t *l)
+ const char *reason, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
if (uw_map) {
@@ -208,7 +208,7 @@ static void uri_worker_map_dump(jk_uri_worker_map_t *uw_map,
int uri_worker_map_alloc(jk_uri_worker_map_t **uw_map_p,
- jk_map_t *init_data, jk_logger_t *l)
+ jk_map_t *init_data, jk_log_context_t *l)
{
int i;
@@ -261,7 +261,7 @@ int uri_worker_map_alloc(jk_uri_worker_map_t **uw_map_p,
return JK_FALSE;
}
-static int uri_worker_map_close(jk_uri_worker_map_t *uw_map, jk_logger_t *l)
+static int uri_worker_map_close(jk_uri_worker_map_t *uw_map, jk_log_context_t
*l)
{
JK_TRACE_ENTER(l);
@@ -279,7 +279,7 @@ static int uri_worker_map_close(jk_uri_worker_map_t
*uw_map, jk_logger_t *l)
return JK_FALSE;
}
-int uri_worker_map_free(jk_uri_worker_map_t **uw_map, jk_logger_t *l)
+int uri_worker_map_free(jk_uri_worker_map_t **uw_map, jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -334,7 +334,7 @@ static int uri_worker_map_realloc(jk_uri_worker_map_t
*uw_map)
*/
static int uri_worker_map_clear(jk_uri_worker_map_t *uw_map,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
uri_worker_record_t *uwr = NULL;
unsigned int i;
@@ -377,7 +377,7 @@ static void extract_activation(jk_pool_t *p,
int *activations,
char *workers,
int activation,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
unsigned int i;
char *worker;
@@ -421,7 +421,7 @@ static void extract_activation(jk_pool_t *p,
static void extension_fix_fail_on_status(jk_pool_t *p,
const char *name,
rule_extension_t *extensions,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
unsigned int i;
int j;
@@ -477,7 +477,7 @@ static void extension_fix_fail_on_status(jk_pool_t *p,
}
static int extension_fix_activation(jk_pool_t *p, const char *name,
jk_worker_t *jw,
- rule_extension_t *extensions, jk_logger_t
*l)
+ rule_extension_t *extensions,
jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
@@ -543,7 +543,7 @@ static int extension_fix_activation(jk_pool_t *p, const
char *name, jk_worker_t
}
static void extension_fix_session(jk_pool_t *p, const char *name, jk_worker_t
*jw,
- rule_extension_t *extensions, jk_logger_t *l)
+ rule_extension_t *extensions,
jk_log_context_t *l)
{
if (jw->type != JK_LB_WORKER_TYPE && extensions->session_cookie) {
jk_log(l, JK_LOG_WARNING,
@@ -572,7 +572,7 @@ static void extension_fix_session(jk_pool_t *p, const char
*name, jk_worker_t *j
}
void extension_fix(jk_pool_t *p, const char *name,
- rule_extension_t *extensions, jk_logger_t *l)
+ rule_extension_t *extensions, jk_log_context_t *l)
{
jk_worker_t *jw = wc_get_worker_for_name(name, l);
if(!jw) {
@@ -589,7 +589,7 @@ void extension_fix(jk_pool_t *p, const char *name,
extension_fix_session(p, name, jw, extensions, l);
}
-void uri_worker_map_switch(jk_uri_worker_map_t *uw_map, jk_logger_t *l)
+void uri_worker_map_switch(jk_uri_worker_map_t *uw_map, jk_log_context_t *l)
{
int new_index;
@@ -609,7 +609,7 @@ void uri_worker_map_switch(jk_uri_worker_map_t *uw_map,
jk_logger_t *l)
}
-void uri_worker_map_ext(jk_uri_worker_map_t *uw_map, jk_logger_t *l)
+void uri_worker_map_ext(jk_uri_worker_map_t *uw_map, jk_log_context_t *l)
{
unsigned int i;
@@ -636,7 +636,7 @@ void uri_worker_map_ext(jk_uri_worker_map_t *uw_map,
jk_logger_t *l)
/* Parse rule extensions */
void parse_rule_extensions(char *rule, rule_extension_t *extensions,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
char *param;
#ifdef _MT_CODE_PTHREAD
@@ -781,7 +781,7 @@ void parse_rule_extensions(char *rule, rule_extension_t
*extensions,
/* Add new entry to NEXT generation */
int uri_worker_map_add(jk_uri_worker_map_t *uw_map,
const char *puri, const char *worker,
- unsigned int source_type, jk_logger_t *l)
+ unsigned int source_type, jk_log_context_t *l)
{
uri_worker_record_t *uwr = NULL;
char *uri;
@@ -884,7 +884,7 @@ int uri_worker_map_add(jk_uri_worker_map_t *uw_map,
}
int uri_worker_map_open(jk_uri_worker_map_t *uw_map,
- jk_map_t *init_data, jk_logger_t *l)
+ jk_map_t *init_data, jk_log_context_t *l)
{
int rc = JK_TRUE;
@@ -959,7 +959,7 @@ int uri_worker_map_open(jk_uri_worker_map_t *uw_map,
}
static int find_match(jk_uri_worker_map_t *uw_map,
- const char *url, jk_logger_t *l)
+ const char *url, jk_log_context_t *l)
{
unsigned int i;
@@ -1012,7 +1012,7 @@ static int find_match(jk_uri_worker_map_t *uw_map,
static int is_nomatch(jk_uri_worker_map_t *uw_map,
const char *uri, int match,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
unsigned int i;
const char *worker = IND_THIS(uw_map->maps)[match]->worker_name;
@@ -1066,7 +1066,7 @@ static int is_nomatch(jk_uri_worker_map_t *uw_map,
const char *map_uri_to_worker_ext(jk_uri_worker_map_t *uw_map,
const char *uri, const char *vhost,
rule_extension_t **extensions,
- int *index, jk_logger_t *l)
+ int *index, jk_log_context_t *l)
{
unsigned int i;
unsigned int vhost_len;
@@ -1214,7 +1214,7 @@ rule_extension_t
*get_uri_to_worker_ext(jk_uri_worker_map_t *uw_map,
}
int uri_worker_map_load(jk_uri_worker_map_t *uw_map,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
int rc = JK_FALSE;
jk_map_t *map;
@@ -1276,7 +1276,7 @@ int uri_worker_map_load(jk_uri_worker_map_t *uw_map,
}
int uri_worker_map_update(jk_uri_worker_map_t *uw_map,
- int force, jk_logger_t *l)
+ int force, jk_log_context_t *l)
{
int rc = JK_TRUE;
time_t now = time(NULL);
diff --git a/native/common/jk_util.c b/native/common/jk_util.c
index 428d8a967..18c98e5cc 100644
--- a/native/common/jk_util.c
+++ b/native/common/jk_util.c
@@ -836,7 +836,7 @@ int jk_log(jk_log_context_t *log_ctx,
}
int jk_check_attribute_length(const char *name, const char *value,
- jk_logger_t *l)
+ jk_log_context_t *l)
{
size_t len = strlen(value);
if (len > JK_MAX_NAME_LEN) {
@@ -2203,7 +2203,7 @@ int jk_wildchar_match(const char *str, const char *exp,
int icase)
return (str[x] != '\0');
}
-int jk_servlet_normalize(char *path, jk_logger_t *logger)
+int jk_servlet_normalize(char *path, jk_log_context_t *logger)
{
int l, w;
@@ -2308,7 +2308,7 @@ int jk_servlet_normalize(char *path, jk_logger_t *logger)
return 0;
}
-int jk_strip_session_id(char* path, char* session_name, jk_logger_t *logger) {
+int jk_strip_session_id(char* path, char* session_name, jk_log_context_t
*logger) {
char *jsessionid;
diff --git a/native/common/jk_worker.c b/native/common/jk_worker.c
index 48f76b1a9..fd6b7c6a2 100644
--- a/native/common/jk_worker.c
+++ b/native/common/jk_worker.c
@@ -31,14 +31,14 @@
#define JK_WORKER_SHUTDOWN_WAIT 100
#define JK_WORKER_SHUTDOWN_COUNT 10
-static void close_workers(jk_logger_t *l);
+static void close_workers(jk_log_context_t *l);
static worker_factory get_factory_for(const char *type);
static int build_worker_map(jk_map_t *init_data,
char **worker_list,
unsigned num_of_workers,
- jk_worker_env_t *we, jk_logger_t *l);
+ jk_worker_env_t *we, jk_log_context_t *l);
/* Global worker list */
static jk_map_t *worker_map;
@@ -48,7 +48,7 @@ static JK_CRIT_SEC worker_lock;
#endif
static int worker_maintain_time = 0;
-int wc_open(jk_map_t *init_data, jk_worker_env_t *we, jk_logger_t *l)
+int wc_open(jk_map_t *init_data, jk_worker_env_t *we, jk_log_context_t *l)
{
int rc;
JK_TRACE_ENTER(l);
@@ -94,7 +94,7 @@ int wc_open(jk_map_t *init_data, jk_worker_env_t *we,
jk_logger_t *l)
}
-void wc_close(jk_logger_t *l)
+void wc_close(jk_log_context_t *l)
{
JK_TRACE_ENTER(l);
JK_DELETE_CS(&worker_lock);
@@ -102,7 +102,7 @@ void wc_close(jk_logger_t *l)
JK_TRACE_EXIT(l);
}
-jk_worker_t *wc_get_worker_for_name(const char *name, jk_logger_t *l)
+jk_worker_t *wc_get_worker_for_name(const char *name, jk_log_context_t *l)
{
jk_worker_t *rc;
@@ -124,7 +124,7 @@ jk_worker_t *wc_get_worker_for_name(const char *name,
jk_logger_t *l)
int wc_create_worker(const char *name, int use_map,
jk_map_t *init_data,
- jk_worker_t **rc, jk_worker_env_t *we, jk_logger_t *l)
+ jk_worker_t **rc, jk_worker_env_t *we, jk_log_context_t
*l)
{
JK_TRACE_ENTER(l);
@@ -210,7 +210,7 @@ int wc_create_worker(const char *name, int use_map,
return JK_FALSE;
}
-static void close_workers(jk_logger_t *l)
+static void close_workers(jk_log_context_t *l)
{
int sz = jk_map_size(worker_map);
@@ -236,7 +236,7 @@ static void close_workers(jk_logger_t *l)
static int build_worker_map(jk_map_t *init_data,
char **worker_list,
unsigned num_of_workers,
- jk_worker_env_t *we, jk_logger_t *l)
+ jk_worker_env_t *we, jk_log_context_t *l)
{
unsigned i;
@@ -295,7 +295,7 @@ static worker_factory get_factory_for(const char *type)
return NULL;
}
-const char *wc_get_name_for_type(int type, jk_logger_t *l)
+const char *wc_get_name_for_type(int type, jk_log_context_t *l)
{
worker_factory_record_t *factory = &worker_factories[0];
while (factory->name) {
@@ -312,7 +312,7 @@ const char *wc_get_name_for_type(int type, jk_logger_t *l)
return NULL;
}
-void wc_maintain(jk_logger_t *l)
+void wc_maintain(jk_log_context_t *l)
{
static time_t last_maintain = 0;
int needs_global_maintenance;
@@ -362,7 +362,7 @@ void wc_maintain(jk_logger_t *l)
JK_TRACE_EXIT(l);
}
-void wc_shutdown(jk_logger_t *l)
+void wc_shutdown(jk_log_context_t *l)
{
int sz = jk_map_size(worker_map);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
