Author: rjung
Date: Sun Nov 19 09:10:43 2006
New Revision: 476849
URL: http://svn.apache.org/viewvc?view=rev&rev=476849
Log:
Part 1 of the vhost merge cleanup
- Adding the missing key_size_indicator merge to Apache 2.0
- Adding the basic infra for having a vhost specific timestamp format
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
tomcat/connectors/trunk/jk/native/common/jk_logger.h
tomcat/connectors/trunk/jk/native/common/jk_util.c
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?view=diff&rev=476849&r1=476848&r2=476849
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Sun Nov 19 09:10:43
2006
@@ -131,6 +131,7 @@
* Request Logging
*/
+ char *stamp_format_string;
char *format_string;
array_header *format;
@@ -1017,7 +1018,12 @@
static const char *jk_set_log_fmt(cmd_parms * cmd,
void *dummy, char *log_format)
{
- jk_set_log_format(log_format);
+ server_rec *s = cmd->server;
+ jk_server_conf_t *conf =
+ (jk_server_conf_t *) ap_get_module_config(s->module_config,
+ &jk_module);
+
+ conf->stamp_format_string = ap_pstrdup(cmd->pool, log_format);
return NULL;
}
@@ -2028,6 +2034,7 @@
c->log_level = JK_LOG_DEF_LEVEL;
c->log = NULL;
c->alias_dir = NULL;
+ c->stamp_format_string = NULL;
c->format_string = NULL;
c->format = NULL;
c->mountcopy = JK_FALSE;
@@ -2118,6 +2125,8 @@
}
overrides->options = base->options;
+ overrides->stamp_format_string = base->stamp_format_string;
+ overrides->format_string = base->format_string;
if (overrides->mountcopy) {
copy_jk_map(p, overrides->s, base->uri_to_context,
@@ -2212,6 +2221,7 @@
if (jkl && flp) {
jkl->log = jk_log_to_file;
jkl->level = conf->log_level;
+ jkl->log_fmt = conf->stamp_format_string;
jkl->logger_private = flp;
flp->log_fd = conf->log_fd;
conf->log = jkl;
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=476849&r1=476848&r2=476849
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sun Nov 19 09:10:43
2006
@@ -165,6 +165,7 @@
* Request Logging
*/
+ char *stamp_format_string;
char *format_string;
apr_array_header_t *format;
@@ -1031,7 +1032,12 @@
static const char *jk_set_log_fmt(cmd_parms * cmd,
void *dummy, const char *log_format)
{
- jk_set_log_format(log_format);
+ server_rec *s = cmd->server;
+ jk_server_conf_t *conf =
+ (jk_server_conf_t *) ap_get_module_config(s->module_config,
+ &jk_module);
+
+ conf->stamp_format_string = apr_pstrdup(cmd->pool, log_format);
return NULL;
}
@@ -2138,6 +2144,7 @@
c->log_level = JK_LOG_DEF_LEVEL;
c->log = NULL;
c->alias_dir = NULL;
+ c->stamp_format_string = NULL;
c->format_string = NULL;
c->format = NULL;
c->mountcopy = JK_FALSE;
@@ -2230,9 +2237,12 @@
overrides->certs_indicator = base->certs_indicator;
overrides->cipher_indicator = base->cipher_indicator;
overrides->session_indicator = base->session_indicator;
+ overrides->key_size_indicator = base->key_size_indicator;
}
overrides->options = base->options;
+ overrides->stamp_format_string = base->stamp_format_string;
+ overrides->format_string = base->format_string;
if (overrides->mountcopy) {
copy_jk_map(p, overrides->s, base->uri_to_context,
@@ -2372,6 +2382,7 @@
if (jkl && flp) {
jkl->log = jk_log_to_file;
jkl->level = conf->log_level;
+ jkl->log_fmt = conf->stamp_format_string;
jkl->logger_private = flp;
flp->jklogfp = conf->jklogfp;
conf->log = jkl;
Modified: tomcat/connectors/trunk/jk/native/common/jk_logger.h
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_logger.h?view=diff&rev=476849&r1=476848&r2=476849
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_logger.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_logger.h Sun Nov 19 09:10:43
2006
@@ -36,6 +36,7 @@
{
void *logger_private;
int level;
+ const char *log_fmt;
int (JK_METHOD * log) (jk_logger_t *l, int level, const char *what);
Modified: tomcat/connectors/trunk/jk/native/common/jk_util.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_util.c?view=diff&rev=476849&r1=476848&r2=476849
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Sun Nov 19 09:10:43 2006
@@ -195,8 +195,6 @@
NULL
};
-const char *jk_log_fmt = JK_TIME_FORMAT;
-
/* Sleep for 100ms */
void jk_sleep(int ms)
{
@@ -216,13 +214,15 @@
#endif
}
-static int set_time_str(char *str, int len)
+static int set_time_str(char *str, int len, const char *jk_log_fmt)
{
time_t t = time(NULL);
struct tm *tms;
tms = localtime(&t);
- return (int)strftime(str, len, jk_log_fmt, tms);
+ if (jk_log_fmt)
+ return (int)strftime(str, len, jk_log_fmt, tms);
+ return (int)strftime(str, len, JK_TIME_FORMAT, tms);
}
/* Write at most n characters to the buffer in str, return the
@@ -397,7 +397,7 @@
if (NULL == buf)
return -1;
#endif
- used = set_time_str(buf, usable_size);
+ used = set_time_str(buf, usable_size, l->log_fmt);
if (line) {
/* Log [pid:threadid] for all levels except REQUEST. */
@@ -853,11 +853,6 @@
return JK_LB_ACTIVATION_DISABLED;
else
return JK_LB_ACTIVATION_ACTIVE;
-}
-
-void jk_set_log_format(const char *logformat)
-{
- jk_log_fmt = (logformat) ? logformat : JK_TIME_FORMAT;
}
int jk_get_lb_factor(jk_map_t *m, const char *wname)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
