Author: rjung
Date: Wed Aug 23 10:22:00 2006
New Revision: 434087
URL: http://svn.apache.org/viewvc?rev=434087&view=rev
Log:
Change default log level from debug/undefined to info.
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
tomcat/connectors/trunk/jk/native/domino/jk_dsapi_plugin.c
tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/native/isapi/jk_isapi_plugin.c
tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.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?rev=434087&r1=434086&r2=434087&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Wed Aug 23 10:22:00
2006
@@ -1874,7 +1874,7 @@
c->mount_file = NULL;
c->log_file = NULL;
c->log_fd = -1;
- c->log_level = -1;
+ c->log_level = JK_LOG_DEF_LEVEL;
c->log = NULL;
c->alias_dir = NULL;
c->format_string = NULL;
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?rev=434087&r1=434086&r2=434087&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Aug 23 10:22:00
2006
@@ -2042,7 +2042,7 @@
c->worker_file = NULL;
c->mount_file = NULL;
c->log_file = NULL;
- c->log_level = -1;
+ c->log_level = JK_LOG_DEF_LEVEL;
c->log = NULL;
c->alias_dir = NULL;
c->format_string = NULL;
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?rev=434087&r1=434086&r2=434087&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_logger.h (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_logger.h Wed Aug 23 10:22:00
2006
@@ -60,6 +60,7 @@
#define JK_LOG_ERROR_LEVEL 4
#define JK_LOG_EMERG_LEVEL 5
#define JK_LOG_REQUEST_LEVEL 6
+#define JK_LOG_DEF_LEVEL JK_LOG_INFO_LEVEL
#define JK_LOG_TRACE_VERB "trace"
#define JK_LOG_DEBUG_VERB "debug"
@@ -67,6 +68,7 @@
#define JK_LOG_WARN_VERB "warn"
#define JK_LOG_ERROR_VERB "error"
#define JK_LOG_EMERG_VERB "emerg"
+#define JK_LOG_DEF_VERB JK_LOG_INFO_VERB
#if defined(__GNUC__) || (defined(_MSC_VER) && (_MSC_VER > 1200))
#define JK_LOG_TRACE __FILE__,__LINE__,__FUNCTION__,JK_LOG_TRACE_LEVEL
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?rev=434087&r1=434086&r2=434087&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_util.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_util.c Wed Aug 23 10:22:00 2006
@@ -228,7 +228,7 @@
return JK_LOG_EMERG_LEVEL;
}
- return JK_LOG_INFO_LEVEL;
+ return JK_LOG_DEF_LEVEL;
}
int jk_open_file_logger(jk_logger_t **l, const char *file, int level)
Modified: tomcat/connectors/trunk/jk/native/domino/jk_dsapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/domino/jk_dsapi_plugin.c?rev=434087&r1=434086&r2=434087&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/domino/jk_dsapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/domino/jk_dsapi_plugin.c Wed Aug 23
10:22:00 2006
@@ -79,7 +79,7 @@
static jk_uri_worker_map_t *uw_map = NULL;
static jk_logger_t *logger = NULL;
-static int logLevel = JK_LOG_EMERG_LEVEL;
+static int logLevel = JK_LOG_DEF_LEVEL;
static jk_pool_t cfgPool;
static const char *logFile;
@@ -614,7 +614,7 @@
GETVNB(JK_WORKER_FILE_TAG, workerFile);
GETVNB(JK_MOUNT_FILE_TAG, workerMountFile);
- logLevel = (NULL == v) ? 0 : jk_parse_log_level(v);
+ logLevel = (NULL == v) ? JK_LOG_DEF_LEVEL : jk_parse_log_level(v);
tomcatStart = GETV(TOMCAT_START);
tomcatStop = GETV(TOMCAT_STOP);
Modified: tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c?rev=434087&r1=434086&r2=434087&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/iis/jk_isapi_plugin.c Wed Aug 23 10:22:00
2006
@@ -148,7 +148,7 @@
static char extension_uri[INTERNET_MAX_URL_LENGTH] =
"/jakarta/isapi_redirect.dll";
static char log_file[MAX_PATH * 2];
-static int log_level = JK_LOG_EMERG_LEVEL;
+static int log_level = JK_LOG_DEF_LEVEL;
static char worker_file[MAX_PATH * 2];
static char worker_mount_file[MAX_PATH * 2] = {0};
static char rewrite_rule_file[MAX_PATH * 2] = {0};
@@ -1307,7 +1307,7 @@
log_level = jk_parse_log_level(tmp);
}
else {
- ok = JK_FALSE;
+ log_level = JK_LOG_DEF_LEVEL;
}
tmp = jk_map_get_string(map, EXTENSION_URI_TAG, NULL);
if (tmp) {
@@ -1371,7 +1371,7 @@
log_level = jk_parse_log_level(tmpbuf);
}
else {
- ok = JK_FALSE;
+ log_level = JK_LOG_DEF_LEVEL;
}
if (get_registry_config_parameter(hkey,
Modified: tomcat/connectors/trunk/jk/native/isapi/jk_isapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/isapi/jk_isapi_plugin.c?rev=434087&r1=434086&r2=434087&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/isapi/jk_isapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/isapi/jk_isapi_plugin.c Wed Aug 23
10:22:00 2006
@@ -82,7 +82,7 @@
static jk_uri_worker_map_t *uw_map = NULL;
static jk_logger_t *logger = NULL;
-static int logLevel = JK_LOG_EMERG_LEVEL;
+static int logLevel = JK_LOG_DEF_LEVEL;
static jk_pool_t cfgPool;
static const char *logFile;
@@ -625,7 +625,7 @@
GETVNB(JK_WORKER_FILE_TAG, workerFile);
GETVNB(JK_MOUNT_FILE_TAG, workerMountFile);
- logLevel = (NULL == v) ? 0 : jk_parse_log_level(v);
+ logLevel = (NULL == v) ? JK_LOG_DEF_LEVEL : jk_parse_log_level(v);
tomcatStart = GETV(TOMCAT_START);
tomcatStop = GETV(TOMCAT_STOP);
Modified: tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c?rev=434087&r1=434086&r2=434087&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c (original)
+++ tomcat/connectors/trunk/jk/native/netscape/jk_nsapi_plugin.c Wed Aug 23
10:22:00 2006
@@ -234,7 +234,7 @@
}
if (!log_level_str) {
- log_level_str = JK_LOG_LEVEL_DEF;
+ log_level_str = JK_LOG_DEF_VERB;
}
if (!jk_open_file_logger(&logger, log_file,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
