Re: Recent updates to Mod_Jk on NetWare ;-(
NormW wrote: Good evening All, Following the recent CVS updates a build of Mod_Jk on Windows using CW for NetWare produces the following... # - # 293: __FUNCTION__ ::service sticky_session=%d\n, I was afraid of that :(. GCC and MSVC has a __FUNCTION__ macro, but CW apparently doesn't. Are you aware of the predefined macros for CW? Perhaps __FUNC__ like on C99? MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
I want to learn the source code of Tomcat
Dear, warm-hearted experts: I want to learn the source code of Tomcat, but I don't know where I should start? Could you give me some directions, such as jsper, catlina... by the way, I am a Chinese java programmer and I have developed six web projects. Best Regards Alan(^_^) _ MSN Hotmail http://www.hotmail.com - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32172] - [2004-11-10 03:16:01] [363 javajni.c] [error] Unsuported JNI version 65537
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32172. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32172 [2004-11-10 03:16:01] [363 javajni.c] [error] Unsuported JNI version 65537 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||DUPLICATE --- Additional Comments From [EMAIL PROTECTED] 2004-11-11 08:04 --- *** This bug has been marked as a duplicate of 28988 *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 28988] - windows nt service fails to start: [2004-05-14 12:45:19] [364 javajni.c] [error] Unsuported JNI version 65537
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=28988. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=28988 windows nt service fails to start: [2004-05-14 12:45:19] [364 javajni.c] [error] Unsuported JNI version 65537 [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] --- Additional Comments From [EMAIL PROTECTED] 2004-11-11 08:04 --- *** Bug 32172 has been marked as a duplicate of this bug. *** - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Recent updates to Mod_Jk on NetWare ;-(
Mladen Turk wrote: NormW wrote: Good evening All, Following the recent CVS updates a build of Mod_Jk on Windows using CW for NetWare produces the following... # - # 293: __FUNCTION__ ::service sticky_session=%d\n, I was afraid of that :(. GCC and MSVC has a __FUNCTION__ macro, but CW apparently doesn't. Are you aware of the predefined macros for CW? Perhaps __FUNC__ like on C99? MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] . Good evening, Nothing like _ALL_ macro's (pun intended). A search of the CLIB/LIBC library source tree finds no match for __FUNC__. I've placed a question on the Novell LibC forum but Murphy's Law of Watched Kettles is in operation. Surely I can't be the only NetWare user watching this considering Novell use Mod_Jk in the Tomcat apps... For the minute, Norm - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Recent updates to Mod_Jk on NetWare ;-(
NormW wrote: Mladen Turk wrote: GCC and MSVC has a __FUNCTION__ macro, but CW apparently doesn't. Are you aware of the predefined macros for CW? Perhaps __FUNC__ like on C99? Good evening, Nothing like _ALL_ macro's (pun intended). A search of the CLIB/LIBC library source tree finds no match for __FUNC__. I've placed a question on the Novell LibC forum but Murphy's Law of Watched Kettles is in operation. Surely I can't be the only NetWare user watching this considering Novell use Mod_Jk in the Tomcat apps... Yes, I searched trough metrowers documentation and there's nothing like __FUNCT__ or __FUNCTION__. I'll think of something else. MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_logger.h jk_util.c jk_util.h
mturk 2004/11/11 01:44:30
Modified:jk/native/common jk_logger.h jk_util.c jk_util.h
Log:
Add __FUNCTION__ as parameter for jk_log.
The function name will be expanded for GCC and MSVC.
Other compilers like CW does not expand function name.
Revision ChangesPath
1.14 +19 -11jakarta-tomcat-connectors/jk/native/common/jk_logger.h
Index: jk_logger.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_logger.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- jk_logger.h 10 Nov 2004 16:36:48 - 1.13
+++ jk_logger.h 11 Nov 2004 09:44:29 - 1.14
@@ -66,27 +66,35 @@
#define JK_LOG_ERROR_VERB error
#define JK_LOG_EMERG_VERB emerg
-#define JK_LOG_TRACE __FILE__,__LINE__,JK_LOG_TRACE_LEVEL
-#define JK_LOG_DEBUG __FILE__,__LINE__,JK_LOG_DEBUG_LEVEL
-#define JK_LOG_INFO__FILE__,__LINE__,JK_LOG_INFO_LEVEL
-#define JK_LOG_WARNING __FILE__,__LINE__,JK_LOG_WARNING_LEVEL
-#define JK_LOG_ERROR __FILE__,__LINE__,JK_LOG_ERROR_LEVEL
-#define JK_LOG_EMERG __FILE__,__LINE__,JK_LOG_EMERG_LEVEL
-#define JK_LOG_REQUEST __FILE__,0,JK_LOG_REQUEST_LEVEL
+#if defined(__GCC__) || defined(_MSC_VER)
+#define JK_LOG_TRACE __FILE__,__LINE__,__FUNCTION__,JK_LOG_TRACE_LEVEL
+#define JK_LOG_DEBUG __FILE__,__LINE__,__FUNCTION__,JK_LOG_DEBUG_LEVEL
+#define JK_LOG_ERROR __FILE__,__LINE__,__FUNCTION__,JK_LOG_ERROR_LEVEL
+#define JK_LOG_EMERG __FILE__,__LINE__,__FUNCTION__,JK_LOG_EMERG_LEVEL
+#else
+#define JK_LOG_TRACE __FILE__,__LINE__,NULL,JK_LOG_TRACE_LEVEL
+#define JK_LOG_DEBUG __FILE__,__LINE__,NULL,JK_LOG_DEBUG_LEVEL
+#define JK_LOG_ERROR __FILE__,__LINE__,NULL,JK_LOG_ERROR_LEVEL
+#define JK_LOG_EMERG __FILE__,__LINE__,NULL,JK_LOG_EMERG_LEVEL
+#endif
+
+#define JK_LOG_INFO__FILE__,__LINE__,NULL,JK_LOG_INFO_LEVEL
+#define JK_LOG_WARNING __FILE__,__LINE__,NULL,JK_LOG_WARNING_LEVEL
+#define JK_LOG_REQUEST __FILE__,0,NULL,JK_LOG_REQUEST_LEVEL
/* Debug level is compile time only
*/
#if defined (DEBUG) || (_DEBUG)
#define JK_TRACE1
-#define JK_TRACE_ENTER(l) jk_log((l), JK_LOG_TRACE, enter __FUNCTION__
\n)
-#define JK_TRACE_EXIT(l) jk_log((l), JK_LOG_TRACE, exit __FUNCTION__
\n)
+#define JK_TRACE_ENTER(l) jk_log((l), JK_LOG_TRACE, enter\n)
+#define JK_TRACE_EXIT(l) jk_log((l), JK_LOG_TRACE, exit\n)
#else
#define JK_TRACE0
#define JK_TRACE_ENTER(l)
#define JK_TRACE_EXIT(l)
#endif
-#define JK_LOG_NULL_PARAMS(l) jk_log((l), JK_LOG_ERROR, __FUNCTION__ NULL
parameters\n)
+#define JK_LOG_NULL_PARAMS(l) jk_log((l), JK_LOG_ERROR, NULL parameters\n)
1.34 +3 -2 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- jk_util.c 9 Nov 2004 12:17:43 - 1.33
+++ jk_util.c 11 Nov 2004 09:44:29 - 1.34
@@ -218,7 +218,8 @@
}
int jk_log(jk_logger_t *l,
- const char *file, int line, int level, const char *fmt, ...)
+ const char *file, int line, const char *funcname, int level,
+ const char *fmt, ...)
{
int rc = 0;
if (!l || !file || !fmt) {
1.20 +3 -2 jakarta-tomcat-connectors/jk/native/common/jk_util.h
Index: jk_util.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_util.h 10 Nov 2004 16:36:48 - 1.19
+++ jk_util.h 11 Nov 2004 09:44:29 - 1.20
@@ -36,7 +36,8 @@
int jk_close_file_logger(jk_logger_t **l);
int jk_log(jk_logger_t *l,
- const char *file, int line, int level, const char *fmt, ...);
+ const char *file, int line, const char *funcname, int level,
+ const char *fmt, ...);
/* [V] Two general purpose functions. Should ease the function bloat. */
int jk_get_worker_str_prop(jk_map_t *m,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c jk_msg_buff.c jk_msg_buff.h jk_uri_worker_map.c jk_worker.c
mturk 2004/11/11 01:45:23
Modified:jk/native/common jk_lb_worker.c jk_msg_buff.c jk_msg_buff.h
jk_uri_worker_map.c jk_worker.c
Log:
Clean up log messages.
Revision ChangesPath
1.28 +4 -4 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_lb_worker.c10 Nov 2004 16:36:48 - 1.27
+++ jk_lb_worker.c11 Nov 2004 09:45:23 - 1.28
@@ -290,7 +290,7 @@
jk_b_reset(s-reco_buf);
s-reco_status = RECO_INITED;
jk_log(l, JK_LOG_DEBUG,
- __FUNCTION__ ::service sticky_session=%d\n,
+ service sticky_session=%d\n,
p-worker-sticky_session);
while (1) {
@@ -306,7 +306,7 @@
rc = rec-w-get_endpoint(rec-w, end, l);
jk_log(l, JK_LOG_DEBUG,
- __FUNCTION__ ::service worker=%s jvm_route=%s
rc=%d\n,
+ service worker=%s jvm_route=%s rc=%d\n,
rec-name, s-jvm_route, rc);
if (rc end) {
@@ -345,7 +345,7 @@
* another worker... Lets try to do that.
*/
jk_log(l, JK_LOG_DEBUG,
- __FUNCTION__ ::recoverable error... will try to
recover on other host\n);
+ recoverable error... will try to recover on other
host\n);
}
else {
/* NULL record, no more workers left ... */
1.20 +5 -4 jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c
Index: jk_msg_buff.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- jk_msg_buff.c 10 Nov 2004 16:28:31 - 1.19
+++ jk_msg_buff.c 11 Nov 2004 09:45:23 - 1.20
@@ -385,13 +385,14 @@
*/
void jk_dump_buff(jk_logger_t *l,
const char *file,
- int line, int level, char *what, jk_msg_buf_t *msg)
+ int line, const char *funcname,
+ int level, char *what, jk_msg_buf_t *msg)
{
#ifdef USE_ALSO_BODY
-jk_log(l, file, line, level, %s #%d %.*s\n,
+jk_log(l, file, line, funcname, level, %s #%d %.*s\n,
what, jk_b_get_len(msg), jk_b_get_len(msg), jk_b_get_buff(msg));
#else
-jk_log(l, file, line, level, %s #%d\n, what, jk_b_get_len(msg));
+jk_log(l, file, line, funcname, level, %s #%d\n, what,
jk_b_get_len(msg));
#endif
}
1.13 +3 -2 jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.h
Index: jk_msg_buff.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_msg_buff.h 8 Nov 2004 13:32:21 - 1.12
+++ jk_msg_buff.h 11 Nov 2004 09:45:23 - 1.13
@@ -157,7 +157,8 @@
/* - Help */
void jk_dump_buff(jk_logger_t *l,
const char *file,
- int line, int level, char *what, jk_msg_buf_t *msg);
+ int line, const char *funcname,
+ int level, char *what, jk_msg_buf_t *msg);
/** Copy a msg buf into another one
*/
1.27 +22 -40
jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c
Index: jk_uri_worker_map.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_uri_worker_map.c 10 Nov 2004 16:36:48 - 1.26
+++ jk_uri_worker_map.c 11 Nov 2004 09:45:23 - 1.27
@@ -142,8 +142,7 @@
init_data, l);
}
-jk_log(l, JK_LOG_ERROR,
- __FUNCTION__ ::uri_worker_map_alloc, NULL parameters\n);
+JK_LOG_NULL_PARAMS(l);
return JK_FALSE;
}
@@ -160,8 +159,7 @@
return JK_TRUE;
}
else
-jk_log(l, JK_LOG_ERROR,
- __FUNCTION__ ::uri_worker_map_free, NULL parameters\n);
+JK_LOG_NULL_PARAMS(l);
return JK_FALSE;
}
@@ -215,7 +213,7 @@
if (!uwr) {
jk_log(l, JK_LOG_ERROR,
- jk_uri_worker_map_t::uri_worker_map_add, can't alloc map
Question about new mod_jk jk_lb_worker.c
Hello Mladen, I have see your checkin's and Rainer Jung very fine mod_jk extension concept mail. I have two questions about lb changes: a) Why you not change the lb_value value after successful recovery at service() function ? After a longer fail the recovered worker get for a long time all new sessions... See also Rainers Jung mail b) I have play around with the mod_jk2 lb algo and find the level feature (hot-standby) very usefull. With this feature I have setup to apache with two separate clusters. Apache 1 Worker T1.1 level 0 Worker T1.2 level 0 Worker T1.3level 0 Worker T2.1 level 1 Worker T2.2 level 1 Worker T2.3level 1 Apache 2 Worker T1.1 level 1 Worker T1.2 level 1 Worker T1.3level 1 Worker T2.1 level 0 Worker T2.2 level 0 Worker T2.3level 0 T1.1-T1.3 Cluster 1 T2.1-T2.3 Cluster 2 With this configuration every Apache has a preferred cluster. Ok small patch are needed: After a crashed node the algo find prefered worker at same level. I thing the domain concept from Rainer Jung in combination with preferred worker from mod_jk2 can be very usefull for clustered env. Regards Peter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 30594] - JK2 modjk-configuration - updateInterval simple-to-fix error
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=30594. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=30594 JK2 modjk-configuration - updateInterval simple-to-fix error --- Additional Comments From [EMAIL PROTECTED] 2004-11-11 11:31 --- I thing the modjk status update is not very well implemented. With the configuration no timer thread is started and no update procedure is initiated. But the real problem is, the update method only handle attribute changes and new elements. After delete some elements at workers2.properties the jmx beans are not deregistered. OK, I thing the idee is good, but the current mod_jk2 developer status is stopped! Peter - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.c jk_pool.c
mturk 2004/11/11 03:56:22
Modified:jk/native/common jk_msg_buff.c jk_pool.c
Log:
Fix #if defined macros
Revision ChangesPath
1.21 +5 -5 jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c
Index: jk_msg_buff.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- jk_msg_buff.c 11 Nov 2004 09:45:23 - 1.20
+++ jk_msg_buff.c 11 Nov 2004 11:56:22 - 1.21
@@ -44,7 +44,7 @@
* Simple marshaling code.
*/
-#if defined (DEBUG) || (_DEBUG)
+#if defined(DEBUG) || defined(_DEBUG)
static void jk_b_dump(jk_msg_buf_t *msg, char *err)
{
int i = 0;
@@ -278,7 +278,7 @@
{
unsigned long i;
if (msg-pos + 3 msg-len) {
-#if defined (DEBUG) || (_DEBUG)
+#if defined(DEBUG) || defined(_DEBUG)
fprintf(stderr, jk_b_get_long::Read after end \n);
#endif
return 0x;
@@ -305,7 +305,7 @@
{
unsigned short i;
if (msg-pos + 1 msg-len) {
-#if defined (DEBUG) || (_DEBUG)
+#if defined(DEBUG) || defined(_DEBUG)
fprintf(stderr, jk_b_get_int::Read after end \n);
#endif
return 0x;
@@ -327,7 +327,7 @@
{
unsigned char rc;
if (msg-pos msg-len) {
-#if defined (DEBUG) || (_DEBUG)
+#if defined(DEBUG) || defined(_DEBUG)
fprintf(stderr, jk_b_get_byte::Read after end \n);
#endif
return 0xFF;
1.11 +5 -2 jakarta-tomcat-connectors/jk/native/common/jk_pool.c
Index: jk_pool.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_pool.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- jk_pool.c 10 Nov 2004 16:28:31 - 1.10
+++ jk_pool.c 11 Nov 2004 11:56:22 - 1.11
@@ -114,7 +114,7 @@
return rc;
}
-#if defined (DEBUG) || (_DEBUG)
+#if defined (DEBUG) || defined(_DEBUG)
void jk_dump_pool(jk_pool_t *p, FILE * f)
{
fprintf(f, Dumping for pool [%p]\n, p);
@@ -148,6 +148,9 @@
p-dyn_size = new_dyn_size;
}
else {
+#if defined (DEBUG) || defined(_DEBUG)
+jk_dump_pool(p, stderr)
+#endif
return NULL;
}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_logger.h
mturk 2004/11/11 03:57:56 Modified:jk/native/common jk_logger.h Log: Use proper gcc macro and fix #if defined Revision ChangesPath 1.15 +8 -3 jakarta-tomcat-connectors/jk/native/common/jk_logger.h Index: jk_logger.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_logger.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- jk_logger.h 11 Nov 2004 09:44:29 - 1.14 +++ jk_logger.h 11 Nov 2004 11:57:56 - 1.15 @@ -66,7 +66,7 @@ #define JK_LOG_ERROR_VERB error #define JK_LOG_EMERG_VERB emerg -#if defined(__GCC__) || defined(_MSC_VER) +#if defined(__GNUC__) || defined(_MSC_VER) #define JK_LOG_TRACE __FILE__,__LINE__,__FUNCTION__,JK_LOG_TRACE_LEVEL #define JK_LOG_DEBUG __FILE__,__LINE__,__FUNCTION__,JK_LOG_DEBUG_LEVEL #define JK_LOG_ERROR __FILE__,__LINE__,__FUNCTION__,JK_LOG_ERROR_LEVEL @@ -84,7 +84,7 @@ /* Debug level is compile time only */ -#if defined (DEBUG) || (_DEBUG) +#if defined (DEBUG) || defined(_DEBUG) #define JK_TRACE1 #define JK_TRACE_ENTER(l) jk_log((l), JK_LOG_TRACE, enter\n) #define JK_TRACE_EXIT(l) jk_log((l), JK_LOG_TRACE, exit\n) @@ -96,6 +96,11 @@ #define JK_LOG_NULL_PARAMS(l) jk_log((l), JK_LOG_ERROR, NULL parameters\n) +/* Debug level macro + * It is more efficient to check the level prior + * calling function that will not execute anyhow because of level + */ +#define JK_IS_DEBUG_LEVEL(l) ((l) (l)-level JK_LOG_INFO_LEVEL) #ifdef __cplusplus - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common Makefile.in
mturk 2004/11/11 03:58:24 Modified:jk/native/common Makefile.in Log: Revert untabify. Makefile does not like spaces Revision ChangesPath 1.12 +1 -1 jakarta-tomcat-connectors/jk/native/common/Makefile.in Index: Makefile.in === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/Makefile.in,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- Makefile.in 10 Nov 2004 16:36:48 - 1.11 +++ Makefile.in 11 Nov 2004 11:58:24 - 1.12 @@ -28,4 +28,4 @@ install: clean: -rm -f *.o *.slo *.lo + rm -f *.o *.slo *.lo - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: Question about new mod_jk jk_lb_worker.c
Peter Rossbach wrote: Hello Mladen, I have see your checkin's and Rainer Jung very fine mod_jk extension concept mail. I have two questions about lb changes: a) Why you not change the lb_value value after successful recovery at service() function ? After a longer fail the recovered worker get for a long time all new sessions... OK. Will check. Seems very reasonable. See also Rainers Jung mail Can you forward that. Seems I can not find it. b) I have play around with the mod_jk2 lb algo and find the level feature (hot-standby) very usefull. I'll have to check whether it will break something. Some patch would be more then welcome :). MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native configure.in
mturk 2004/11/11 04:30:47
Modified:jk/native configure.in
Log:
Add --enable-maintainer-mode for compiling in
full trace messages (like on httpd)
Revision ChangesPath
1.35 +19 -3 jakarta-tomcat-connectors/jk/native/configure.in
Index: configure.in
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/configure.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- configure.in 23 Jul 2004 09:23:38 - 1.34
+++ configure.in 11 Nov 2004 12:30:47 - 1.35
@@ -5,7 +5,7 @@
AC_PREREQ(2.13)
AC_INIT(common/jk_worker.h)
-AC_CONFIG_HEADER(common/portable.h)
+AM_CONFIG_HEADER(common/portable.h)
AC_CONFIG_AUX_DIR(scripts/build/unix)
AC_CANONICAL_SYSTEM
@@ -220,12 +220,28 @@
CFLAGS=${CFLAGS}
AC_ARG_ENABLE(
EAPI,
-[ --enable-EAPI Enable EAPI support (mod_ssl, Apache 1.3)],
+[ --enable-EAPI Enable EAPI support (mod_ssl, Apache 1.3)],
[
case ${enableval} in
y | Y | YES | yes | TRUE | true )
CFLAGS=${CFLAGS} -DEAPI
AC_MSG_RESULT([...Enabling EAPI Support...])
+;;
+esac
+])
+AC_SUBST(CFLAGS)
+
+dnl CFLAGS for maintainer mode
+dnl it also allows the CFLAGS environment variable.
+CFLAGS=${CFLAGS}
+AC_ARG_ENABLE(
+maintainer-mode,
+[ --enable-maintainer-mode Turn on debugging and compile time warnings],
+[
+case ${enableval} in
+y | Y | YES | yes | TRUE | true )
+CFLAGS=${CFLAGS} -DDEBUG -Wall
+AC_MSG_RESULT([...Enabling Maintainer mode...])
;;
esac
])
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32180] New: - EL functions are executed in privileged context
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32180. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32180 EL functions are executed in privileged context Summary: EL functions are executed in privileged context Product: Tomcat 5 Version: 5.5.4 Platform: All OS/Version: All Status: NEW Severity: Normal Priority: Other Component: Jasper AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] When tomcat is run with SecurityManager enabled all defined EL functions are executed in privileged AccessControlContext by PageContextImpl.proprietaryEvaluate() method. This causes problems when EL functions perform actions that require checking of permissions or need to access currently executing Subject. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_pool.c
mturk 2004/11/11 06:09:03
Modified:jk/native/common jk_pool.c
Log:
Add missing semicolon.
Revision ChangesPath
1.12 +2 -2 jakarta-tomcat-connectors/jk/native/common/jk_pool.c
Index: jk_pool.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_pool.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_pool.c 11 Nov 2004 11:56:22 - 1.11
+++ jk_pool.c 11 Nov 2004 14:09:03 - 1.12
@@ -149,7 +149,7 @@
}
else {
#if defined (DEBUG) || defined(_DEBUG)
-jk_dump_pool(p, stderr)
+jk_dump_pool(p, stderr);
#endif
return NULL;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/tcp ReplicationTransmitter.java ReplicationValve.java SimpleTcpCluster.java
pero2004/11/11 06:47:27
Modified:modules/cluster/src/share/org/apache/catalina/cluster
CatalinaCluster.java
modules/cluster/src/share/org/apache/catalina/cluster/mcast
McastService.java McastServiceImpl.java
modules/cluster/src/share/org/apache/catalina/cluster/tcp
ReplicationTransmitter.java ReplicationValve.java
SimpleTcpCluster.java
Log:
add some missing getters
add some if(log.isXXXEnabled().
Revision ChangesPath
1.9 +3 -1
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java
Index: CatalinaCluster.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/CatalinaCluster.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CatalinaCluster.java 19 Oct 2004 22:30:50 - 1.8
+++ CatalinaCluster.java 11 Nov 2004 14:47:26 - 1.9
@@ -108,5 +108,7 @@
public Manager getManager(String name);
public void removeManager(String name);
public void addManager(String name, ClusterManager manager);
+public Valve getValve();
+
}
1.13 +42 -19
jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastService.java
Index: McastService.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/modules/cluster/src/share/org/apache/catalina/cluster/mcast/McastService.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- McastService.java 1 Jul 2004 09:44:26 - 1.12
+++ McastService.java 11 Nov 2004 14:47:26 - 1.13
@@ -111,24 +111,44 @@
properties.setProperty(mcastAddress, addr);
}
+public String getMcastAddr() {
+return properties.getProperty(mcastAddress);
+}
+
public void setMcastBindAddress(String bindaddr) {
properties.setProperty(mcastBindAddress, bindaddr);
}
+public String getMcastBindAddress() {
+return properties.getProperty(mcastBindAddress);
+}
+
public void setMcastPort(int port) {
properties.setProperty(mcastPort, String.valueOf(port));
}
+public int getMcastPort() {
+String p = properties.getProperty(mcastPort);
+return new Integer(p).intValue();
+}
+
public void setMcastFrequency(long time) {
properties.setProperty(msgFrequency, String.valueOf(time));
}
+public long getMcastFrequency() {
+String p = properties.getProperty(msgFrequency);
+return new Long(p).longValue();
+}
+
public void setMcastDropTime(long time) {
properties.setProperty(memberDropTime, String.valueOf(time));
}
-
-
+public long getMcastDropTime() {
+String p = properties.getProperty(memberDropTime);
+return new Long(p).longValue();
+}
/**
* Check if a required property is available.
@@ -195,7 +215,8 @@
this);
impl.start(level);
-log.info(Sleeping for
+(Long.parseLong(properties.getProperty(msgFrequency))*4)+ secs to
establish cluster membership);
+ if(log.isInfoEnabled())
+log.info(Sleeping for
+(Long.parseLong(properties.getProperty(msgFrequency))*4)+ secs to
establish cluster membership);
Thread.sleep((Long.parseLong(properties.getProperty(msgFrequency))*4));
}
@@ -247,13 +268,29 @@
if ( listener!=null ) listener.memberDisappeared(member);
}
+public int getMcastSoTimeout() {
+return mcastSoTimeout;
+}
+public void setMcastSoTimeout(int mcastSoTimeout) {
+this.mcastSoTimeout = mcastSoTimeout;
+properties.setProperty(mcastSoTimeout,
String.valueOf(mcastSoTimeout));
+}
+public int getMcastTTL() {
+return mcastTTL;
+}
+public void setMcastTTL(int mcastTTL) {
+this.mcastTTL = mcastTTL;
+properties.setProperty(mcastTTL, String.valueOf(mcastTTL));
+}
+
/**
* Simple test program
* @param args Command-line arguments
* @throws Exception If an error occurs
*/
public static void main(String args[]) throws Exception {
-log.info(Usage McastService hostname tcpport);
+ if(log.isInfoEnabled())
+log.info(Usage McastService hostname tcpport);
McastService service = new McastService();
java.util.Properties p = new java.util.Properties();
p.setProperty(mcastPort,);
@@ -266,19
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote ProtocolHandler.java
pero2004/11/11 06:52:45 Modified:coyote/src/java/org/apache/coyote ProtocolHandler.java Log: add getAttributeNames to access all Connector attributes Revision ChangesPath 1.7 +3 -1 jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/ProtocolHandler.java Index: ProtocolHandler.java === RCS file: /home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/ProtocolHandler.java,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ProtocolHandler.java 24 Feb 2004 08:54:29 - 1.6 +++ ProtocolHandler.java 11 Nov 2004 14:52:45 - 1.7 @@ -16,6 +16,8 @@ package org.apache.coyote; +import java.util.Iterator; + /** * Abstract the protocol implementation, including threading, etc. @@ -35,7 +37,7 @@ public Object getAttribute(String name); - +public Iterator getAttributeNames(); /** * The adapter, used to call the connector. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/memory MemoryProtocolHandler.java
pero2004/11/11 06:53:14
Modified:coyote/src/java/org/apache/coyote/memory
MemoryProtocolHandler.java
Log:
add getAttributeNames to access all Connector attributes
Revision ChangesPath
1.6 +2 -2
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/memory/MemoryProtocolHandler.java
Index: MemoryProtocolHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/memory/MemoryProtocolHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- MemoryProtocolHandler.java24 Apr 2004 14:54:13 - 1.5
+++ MemoryProtocolHandler.java11 Nov 2004 14:53:14 - 1.6
@@ -17,7 +17,7 @@
package org.apache.coyote.memory;
import java.io.IOException;
-
+import java.util.Iterator;
import org.apache.tomcat.util.buf.ByteChunk;
import org.apache.coyote.Adapter;
@@ -52,7 +52,7 @@
return null;
}
-
+public Iterator getAttributeNames() { return null ; }
/**
* Associated adapter.
*/
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11 Http11Protocol.java
pero2004/11/11 06:54:20
Modified:http11/src/java/org/apache/coyote/http11 Http11Protocol.java
Log:
add getAttributeNames to access all Connector attributes
Revision ChangesPath
1.60 +5 -0
jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java
Index: Http11Protocol.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/http11/src/java/org/apache/coyote/http11/Http11Protocol.java,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- Http11Protocol.java 4 Oct 2004 13:48:11 - 1.59
+++ Http11Protocol.java 11 Nov 2004 14:54:20 - 1.60
@@ -24,6 +24,7 @@
import java.net.URLEncoder;
import java.util.Enumeration;
import java.util.Hashtable;
+import java.util.Iterator;
import javax.management.MBeanRegistration;
import javax.management.MBeanServer;
@@ -84,6 +85,10 @@
if( log.isTraceEnabled())
log.trace(sm.getString(http11protocol.getattribute, key));
return attributes.get(key);
+}
+
+public Iterator getAttributeNames() {
+return attributes.keySet().iterator();
}
/**
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/java/org/apache/jk/server JkCoyoteHandler.java
pero2004/11/11 06:55:29
Modified:jk/java/org/apache/jk/server JkCoyoteHandler.java
Log:
add getAttributeNames to access all Connector attributes
Revision ChangesPath
1.57 +5 -0
jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java
Index: JkCoyoteHandler.java
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/java/org/apache/jk/server/JkCoyoteHandler.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- JkCoyoteHandler.java 5 Jun 2004 05:19:04 - 1.56
+++ JkCoyoteHandler.java 11 Nov 2004 14:55:28 - 1.57
@@ -25,6 +25,7 @@
import java.security.AccessController;
import java.security.PrivilegedActionException;
import java.security.PrivilegedAction;
+import java.util.Iterator;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -109,6 +110,10 @@
public String getProperty( String name ) {
return properties.getProperty(name) ;
+}
+
+public Iterator getAttributeNames() {
+ return properties.keySet().iterator();
}
/** Pass config info
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/webapps/docs changelog.xml
pero2004/11/11 07:05:16 Modified:webapps/docs changelog.xml Log: Add my Cluster getter and ProtocolHandler.getAttributeNames change Revision ChangesPath 1.162 +6 -0 jakarta-tomcat-catalina/webapps/docs/changelog.xml Index: changelog.xml === RCS file: /home/cvs/jakarta-tomcat-catalina/webapps/docs/changelog.xml,v retrieving revision 1.161 retrieving revision 1.162 diff -u -r1.161 -r1.162 --- changelog.xml 2 Nov 2004 19:08:22 - 1.161 +++ changelog.xml 11 Nov 2004 15:05:16 - 1.162 @@ -145,6 +145,9 @@ fix bug31090/bug: Use a URL encoded path when setting session cookies. (remm) /fix +add + Add getAttributeName() to ProtocolHandler to get all attributes at runtime (pero) +/add /changelog /subsection @@ -158,6 +161,9 @@ subsection name=Cluster changelog +add + Add some missing Getters and log.isXXXEnableds (pero) +/add /changelog /subsection - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_global.h
mturk 2004/11/11 09:01:50 Modified:jk/native/common jk_global.h Log: Add process.h include for getpid() Revision ChangesPath 1.39 +2 -1 jakarta-tomcat-connectors/jk/native/common/jk_global.h Index: jk_global.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_global.h,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- jk_global.h 10 Nov 2004 16:36:48 - 1.38 +++ jk_global.h 11 Nov 2004 17:01:50 - 1.39 @@ -61,6 +61,7 @@ #include windows.h #include winsock.h #include sys/timeb.h +#include process.h #else #include unistd.h #if defined(NETWARE) defined(__NOVELL_LIBC__) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_logger.h
mturk 2004/11/11 09:02:25 Modified:jk/native/common jk_logger.h Log: Use __FUNCTION__ for every log level except REQUEST Revision ChangesPath 1.16 +5 -3 jakarta-tomcat-connectors/jk/native/common/jk_logger.h Index: jk_logger.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_logger.h,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- jk_logger.h 11 Nov 2004 11:57:56 - 1.15 +++ jk_logger.h 11 Nov 2004 17:02:25 - 1.16 @@ -71,15 +71,17 @@ #define JK_LOG_DEBUG __FILE__,__LINE__,__FUNCTION__,JK_LOG_DEBUG_LEVEL #define JK_LOG_ERROR __FILE__,__LINE__,__FUNCTION__,JK_LOG_ERROR_LEVEL #define JK_LOG_EMERG __FILE__,__LINE__,__FUNCTION__,JK_LOG_EMERG_LEVEL +#define JK_LOG_INFO__FILE__,__LINE__,__FUNCTION__,JK_LOG_INFO_LEVEL +#define JK_LOG_WARNING __FILE__,__LINE__,__FUNCTION__,JK_LOG_WARNING_LEVEL #else #define JK_LOG_TRACE __FILE__,__LINE__,NULL,JK_LOG_TRACE_LEVEL #define JK_LOG_DEBUG __FILE__,__LINE__,NULL,JK_LOG_DEBUG_LEVEL #define JK_LOG_ERROR __FILE__,__LINE__,NULL,JK_LOG_ERROR_LEVEL #define JK_LOG_EMERG __FILE__,__LINE__,NULL,JK_LOG_EMERG_LEVEL -#endif - #define JK_LOG_INFO__FILE__,__LINE__,NULL,JK_LOG_INFO_LEVEL #define JK_LOG_WARNING __FILE__,__LINE__,NULL,JK_LOG_WARNING_LEVEL +#endif + #define JK_LOG_REQUEST __FILE__,0,NULL,JK_LOG_REQUEST_LEVEL /* Debug level is compile time only - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.c
mturk 2004/11/11 09:03:29
Modified:jk/native/common jk_msg_buff.c
Log:
Backport message dumping from JK2.
The message will dump if loglevel is trace
Revision ChangesPath
1.22 +49 -7 jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c
Index: jk_msg_buff.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_msg_buff.c 11 Nov 2004 11:56:22 - 1.21
+++ jk_msg_buff.c 11 Nov 2004 17:03:29 - 1.22
@@ -39,11 +39,15 @@
int maxlen;
};
+static char *jk_HEX = 0123456789ABCDEFX;
/*
* Simple marshaling code.
*/
+/* Deprecated: We need smarter way for that.
+ Do not use stderr for logging
+ */
#if defined(DEBUG) || defined(_DEBUG)
static void jk_b_dump(jk_msg_buf_t *msg, char *err)
{
@@ -388,12 +392,50 @@
int line, const char *funcname,
int level, char *what, jk_msg_buf_t *msg)
{
-#ifdef USE_ALSO_BODY
-jk_log(l, file, line, funcname, level, %s #%d %.*s\n,
- what, jk_b_get_len(msg), jk_b_get_len(msg), jk_b_get_buff(msg));
-#else
-jk_log(l, file, line, funcname, level, %s #%d\n, what,
jk_b_get_len(msg));
-#endif
+int i = 0;
+char lb[80];
+char *current;
+int j;
+int len = msg-len;
+
+if (l-level == JK_LOG_DEBUG_LEVEL) {
+len = 0;
+}
+else if (len 1024)
+len = 1024;
+
+jk_log(l, file, line, funcname, level,
+ %s pos=%d len=%d max=%d \n,
+ what, msg-pos, msg-len, msg-maxlen);
+
+for (i = 0; i len; i += 16) {
+current = lb[0];
+
+for (j = 0; j 16; j++) {
+unsigned char x = (msg-buf[i + j]);
+
+*current++ = jk_HEX[x 4];
+*current++ = jk_HEX[x 0x0f];
+*current++ = ' ';
+}
+*current++ = ' ';
+*current++ = '-';
+*current++ = ' ';
+for (j = 0; j 16; j++) {
+unsigned char x = msg-buf[i + j];
+
+if (x 0x20 x 0x7F) {
+*current++ = x;
+}
+else {
+*current++ = '.';
+}
+}
+*current++ = '\n';
+*current++ = '\0';
+jk_log(l, file, line, funcname, level,
+ %.4x%s, i, line);
+}
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_mt.h
mturk 2004/11/11 09:04:04 Modified:jk/native/common jk_mt.h Log: Add thread identifier macro Revision ChangesPath 1.7 +7 -1 jakarta-tomcat-connectors/jk/native/common/jk_mt.h Index: jk_mt.h === RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_mt.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- jk_mt.h 8 Oct 2004 07:50:40 - 1.6 +++ jk_mt.h 11 Nov 2004 17:04:04 - 1.7 @@ -47,6 +47,8 @@ #define JK_ENTER_CS(x, rc) EnterCriticalSection(x); rc = JK_TRUE; #define JK_LEAVE_CS(x, rc) LeaveCriticalSection(x); rc = JK_TRUE; +#define JK_THREADID() ((int)GetCurrentThreadId()) + #else /* Unix pthreads */ #include pthread.h @@ -64,6 +66,9 @@ #define JK_LEAVE_CS(x, rc)\ if(pthread_mutex_unlock(x)) rc = JK_FALSE; else rc = JK_TRUE; + +#define JK_THREADID() ((int)pthread_self()) + #endif /* Unix pthreads */ #else /* Not an MT code */ @@ -74,6 +79,7 @@ #define JK_DELETE_CS(x, rc) rc = JK_TRUE; #define JK_ENTER_CS(x, rc) rc = JK_TRUE; #define JK_LEAVE_CS(x, rc) rc = JK_TRUE; +#define JK_THREADID() 0 #endif /* Not an MT code */ - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2004/11/11 09:06:06
Modified:jk/native/common jk_util.c
Log:
Implement new __FUNCTION__ logging.
Also log PID and ThreadID. This helps tracing log messages
when they are comming from diferent childs/threads.
Revision ChangesPath
1.35 +46 -9 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- jk_util.c 11 Nov 2004 09:44:29 - 1.34
+++ jk_util.c 11 Nov 2004 17:06:06 - 1.35
@@ -24,6 +24,7 @@
#include jk_util.h
#include jk_ajp12_worker.h
+#include jk_mt.h
#define SYSPROPS_OF_WORKER (sysprops)
#define STDERR_OF_WORKER(stderr)
@@ -84,6 +85,17 @@
#define JK_TIME_FORMAT [%a %b %d %H:%M:%S %Y]
#endif
+
+static const char *jk_level_werbs[] = {
+[ JK_LOG_TRACE_WERB ] ,
+[ JK_LOG_DEBUG_VERB ] ,
+[ JK_LOG_INFO_VERB ] ,
+[ JK_LOG_WARNING_VERB ] ,
+[ JK_LOG_ERROR_VERB ] ,
+[ JK_LOG_EMERG_VERB ] ,
+NULL
+};
+
const char *jk_log_fmt = JK_TIME_FORMAT;
static void set_time_str(char *str, int len)
@@ -168,7 +180,11 @@
return JK_LOG_EMERG_LEVEL;
}
-return JK_LOG_DEBUG_LEVEL;
+if (0 == strcasecmp(level, JK_LOG_DEBUG_VERB)) {
+return JK_LOG_DEBUG_LEVEL;
+}
+
+return JK_LOG_TRACE_LEVEL;
}
int jk_open_file_logger(jk_logger_t **l, const char *file, int level)
@@ -245,7 +261,6 @@
f++;
}
-#ifdef USE_SPRINTF /* until we get a snprintf function */
#ifdef NETWARE
buf = (char *)malloc(HUGE_BUFFER_SIZE);
if (NULL == buf)
@@ -253,15 +268,37 @@
#endif
set_time_str(buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
+
+#ifdef USE_SPRINTF /* until we get a snprintf function */
if (line)
-used += sprintf(buf[used], [%s (%d)]: , f, line);
+used += sprintf(buf[used], [%d:%d] , getpid(),
+JK_THREADID());
+#else
+if (line)
+used += snprintf(buf[used], HUGE_BUFFER_SIZE, [%d:%d] ,
+ getpid(), JK_THREADID());
+#endif
+if (used 0) {
+return 0; /* [V] not sure what to return... */
+}
+if (line) {
+strcat(buf, jk_level_werbs[level]);
+used += 8;
+
+if (funcname) {
+strcat(buf, funcname);
+strcat(buf, ::);
+used += strlen(funcname) + 2;
+}
+}
+
+#ifdef USE_SPRINTF /* until we get a snprintf function */
+if (line)
+used += sprintf(buf[used], %s (%d): , f, line);
#else
-set_time_str(buf, HUGE_BUFFER_SIZE);
-used = strlen(buf);
if (line)
-used +=
-snprintf(buf[used], HUGE_BUFFER_SIZE, [%s (%d)]: , f,
- line);
+used += snprintf(buf[used], HUGE_BUFFER_SIZE, %s (%d): ,
+ f, line);
#endif
if (used 0) {
return 0; /* [V] not sure what to return... */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_msg_buff.c
mturk 2004/11/11 09:16:35
Modified:jk/native/common jk_msg_buff.c
Log:
When logrequest is DEBUG dump only message info.
In any other case dump entire message packet.
Also dump entire message when loglevel is trace.
Revision ChangesPath
1.23 +6 -3 jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c
Index: jk_msg_buff.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_msg_buff.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_msg_buff.c 11 Nov 2004 17:03:29 - 1.22
+++ jk_msg_buff.c 11 Nov 2004 17:16:35 - 1.23
@@ -398,10 +398,13 @@
int j;
int len = msg-len;
-if (l-level == JK_LOG_DEBUG_LEVEL) {
+if (level == JK_LOG_DEBUG_LEVEL) {
len = 0;
+if (l-level == JK_LOG_TRACE_LEVEL)
+len = msg-len;
}
-else if (len 1024)
+
+if (len 1024)
len = 1024;
jk_log(l, file, line, funcname, level,
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp13.c
mturk 2004/11/11 09:25:05
Modified:jk/native/common jk_ajp13.c
Log:
Add new trace macros.
Revision ChangesPath
1.13 +5 -11 jakarta-tomcat-connectors/jk/native/common/jk_ajp13.c
Index: jk_ajp13.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- jk_ajp13.c10 Nov 2004 16:36:48 - 1.12
+++ jk_ajp13.c11 Nov 2004 17:25:04 - 1.13
@@ -30,9 +30,7 @@
int ajp13_marshal_shutdown_into_msgb(jk_msg_buf_t *msg,
jk_pool_t *p, jk_logger_t *l)
{
-#ifdef JK_TRACE
-jk_log(l, JK_LOG_TRACE, enter ajp13_marshal_shutdown_into_msgb\n);
-#endif
+JK_TRACE_ENTER(l);
/* To be on the safe side */
jk_b_reset(msg);
@@ -41,15 +39,11 @@
*/
if (jk_b_append_byte(msg, JK_AJP13_SHUTDOWN)) {
jk_log(l, JK_LOG_ERROR,
- Error ajp13_marshal_shutdown_into_msgb - Error appending
shutdown message\n);
-#ifdef JK_TRACE
-jk_log(l, JK_LOG_TRACE, leave 1
ajp13_marshal_shutdown_into_msgb\n);
-#endif
+ failed appending shutdown message\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
-#ifdef JK_TRACE
-jk_log(l, JK_LOG_TRACE, leave 2
ajp13_marshal_shutdown_into_msgb\n);
-#endif
+JK_TRACE_EXIT(l);
return JK_TRUE;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp13_worker.c
Mladen Turk wrote: jean-frederic clere wrote: Mladen Turk wrote: Costin Manolache wrote: Are you joking :-) ? If we can not alloc couple of bytes from the system, then the entire system is unstable. Or that the process that makes the malloc() has reached a configurable limit of the amount of memory it is allowed to use. Sure, but the system is still unusable. This checking is done inside worker_factory, called from init_jk, so IMHO the apache will fail long before. But if everyone thinks it's a good to check for failed memory allocation on small objects, I'll revert the patch. Well, I see your point - probably it doesn't matter much, I'm sure other places in code will not check and it would crash anyway. Most OSes use swap, so the system will trash and become unuseable before running out of memory. But there are other cases where the swap is not used - and then malloc failure is a common condition under load. If the system is very loaded, it is possible you'll run low on memory and you don't know which malloc will fail - maybe the small one. The correct behavior would be to give up and return a 500 on the request ( that may go through since apache probably already have the memory allocated in the memory pools ). On single process/multithread systesm, an apache server crashing under load is not a good thing :-) IMO all mallocs should be checked - but probably I spend too much time with systems with very little memory where a crash is not such a good thing :-) Costin Costin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp13_worker.c
mturk 2004/11/11 09:28:59
Modified:jk/native/common jk_ajp13_worker.c
Log:
Add new trace macros and clean up some log messages.
Revision ChangesPath
1.19 +23 -14
jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c
Index: jk_ajp13_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp13_worker.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- jk_ajp13_worker.c 10 Nov 2004 16:36:48 - 1.18
+++ jk_ajp13_worker.c 11 Nov 2004 17:28:59 - 1.19
@@ -30,8 +30,11 @@
jk_map_t *props,
jk_worker_env_t *we, jk_logger_t *l)
{
+int rc;
JK_TRACE_ENTER(l);
-return (ajp_validate(pThis, props, we, l, AJP13_PROTO));
+rc = ajp_validate(pThis, props, we, l, AJP13_PROTO);
+JK_TRACE_EXIT(l);
+return rc;
}
@@ -39,23 +42,32 @@
jk_map_t *props,
jk_worker_env_t *we, jk_logger_t *l)
{
+int rc;
JK_TRACE_ENTER(l);
-return (ajp_init(pThis, props, we, l, AJP13_PROTO));
+rc = ajp_init(pThis, props, we, l, AJP13_PROTO);
+JK_TRACE_EXIT(l);
+return rc;
}
static int JK_METHOD destroy(jk_worker_t **pThis, jk_logger_t *l)
{
+int rc;
JK_TRACE_ENTER(l);
-return (ajp_destroy(pThis, l, AJP13_PROTO));
+rc = ajp_destroy(pThis, l, AJP13_PROTO);
+JK_TRACE_EXIT(l);
+return rc;
}
static int JK_METHOD get_endpoint(jk_worker_t *pThis,
jk_endpoint_t **pend, jk_logger_t *l)
{
+int rc;
JK_TRACE_ENTER(l);
-return (ajp_get_endpoint(pThis, pend, l, AJP13_PROTO));
+rc = ajp_get_endpoint(pThis, pend, l, AJP13_PROTO);
+JK_TRACE_EXIT(l);
+return rc;
}
int JK_METHOD ajp13_worker_factory(jk_worker_t **w,
@@ -65,29 +77,26 @@
JK_TRACE_ENTER(l);
if (name == NULL || w == NULL) {
-jk_log(l, JK_LOG_ERROR, In ajp13_worker_factory, NULL
parameters\n);
+JK_LOG_NULL_PARAMS(l);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
if (!aw) {
jk_log(l, JK_LOG_ERROR,
- In ajp13_worker_factory, malloc of private_data failed\n);
+ malloc of private_data failed\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
aw-name = strdup(name);
-/* Lets core dump for every malloc.
- If we can not allocate few bytes what's the purpose
- to keep anyhow and waste cpr cycles
- */
-#if 0
if (!aw-name) {
free(aw);
-jk_log(l, JK_LOG_ERROR, In ajp13_worker_factory, malloc failed\n);
+jk_log(l, JK_LOG_ERROR, malloc failed\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
-#endif
aw-proto = AJP13_PROTO;
aw-login = NULL;
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp13_worker.c
TAKE MY EMAIL OFF OF YOUR LIST. THANK YOU Costin Manolache [EMAIL PROTECTED] wrote:Mladen Turk wrote: jean-frederic clere wrote: Mladen Turk wrote: Costin Manolache wrote: Are you joking :-) ? If we can not alloc couple of bytes from the system, then the entire system is unstable. Or that the process that makes the malloc() has reached a configurable limit of the amount of memory it is allowed to use. Sure, but the system is still unusable. This checking is done inside worker_factory, called from init_jk, so IMHO the apache will fail long before. But if everyone thinks it's a good to check for failed memory allocation on small objects, I'll revert the patch. Well, I see your point - probably it doesn't matter much, I'm sure other places in code will not check and it would crash anyway. Most OSes use swap, so the system will trash and become unuseable before running out of memory. But there are other cases where the swap is not used - and then malloc failure is a common condition under load. If the system is very loaded, it is possible you'll run low on memory and you don't know which malloc will fail - maybe the small one. The correct behavior would be to give up and return a 500 on the request ( that may go through since apache probably already have the memory allocated in the memory pools ). On single process/multithread systesm, an apache server crashing under load is not a good thing :-) IMO all mallocs should be checked - but probably I spend too much time with systems with very little memory where a crash is not such a good thing :-) Costin Costin - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp14.c
mturk 2004/11/11 09:43:01
Modified:jk/native/common jk_ajp14.c
Log:
Add new trace macros and clean up some log messages.
Revision ChangesPath
1.23 +86 -48jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c
Index: jk_ajp14.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_ajp14.c10 Nov 2004 16:36:48 - 1.22
+++ jk_ajp14.c11 Nov 2004 17:43:01 - 1.23
@@ -38,7 +38,7 @@
jk_md5((const unsigned char *)s-entropy,
(const unsigned char *)s-secret_key, s-computed_key);
-jk_log(l, JK_LOG_DEBUG, Into ajp14_compute_md5 (%s/%s) - (%s)\n,
+jk_log(l, JK_LOG_DEBUG, (%s/%s) - (%s)\n,
s-entropy, s-secret_key, s-computed_key);
JK_TRACE_EXIT(l);
}
@@ -63,21 +63,24 @@
/*
* LOGIN
*/
-if (jk_b_append_byte(msg, AJP14_LOGINIT_CMD))
+if (jk_b_append_byte(msg, AJP14_LOGINIT_CMD)) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
-
+}
/*
* NEGOCIATION FLAGS
*/
-if (jk_b_append_long(msg, s-negociation))
+if (jk_b_append_long(msg, s-negociation)) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
-
+}
/*
* WEB-SERVER NAME
*/
if (jk_b_append_string(msg, s-web_server_name)) {
jk_log(l, JK_LOG_ERROR,
- Error ajp14_marshal_login_init_into_msgb - Error appending
the web_server_name string\n);
+ failed appending the web_server_name string\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -103,7 +106,8 @@
if (jk_b_get_bytes
(msg, (unsigned char *)s-entropy, AJP14_ENTROPY_SEED_LEN) 0) {
jk_log(l, JK_LOG_ERROR,
- Error ajp14_unmarshal_login_seed - can't get seed\n);
+ can't get seed\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -132,9 +136,10 @@
/*
* LOGIN
*/
-if (jk_b_append_byte(msg, AJP14_LOGCOMP_CMD))
+if (jk_b_append_byte(msg, AJP14_LOGCOMP_CMD)) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
-
+}
/*
* COMPUTED-SEED
*/
@@ -142,7 +147,8 @@
(msg, (const unsigned char *)s-computed_key,
AJP14_COMPUTED_KEY_LEN)) {
jk_log(l, JK_LOG_ERROR,
- Error ajp14_marshal_login_comp_into_msgb - Error appending
the COMPUTED MD5 bytes\n);
+ failed appending the COMPUTED MD5 bytes\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -172,7 +178,8 @@
if (nego == 0x) {
jk_log(l, JK_LOG_ERROR,
- Error ajp14_unmarshal_log_ok - can't get negociated data\n);
+ can't get negociated data\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -180,7 +187,8 @@
if (!sname) {
jk_log(l, JK_LOG_ERROR,
- Error ajp14_unmarshal_log_ok - can't get servlet engine
name\n);
+ can't get servlet engine name\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -191,7 +199,8 @@
if (!s-servlet_engine_name) {
jk_log(l, JK_LOG_ERROR,
- Error ajp14_unmarshal_log_ok - can't malloc servlet engine
name\n);
+ can't malloc servlet engine name\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -219,7 +228,8 @@
if (status == 0x) {
jk_log(l, JK_LOG_ERROR,
- Error ajp14_unmarshal_log_nok - can't get failure code\n);
+ can't get failure code\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -251,9 +261,10 @@
/*
* SHUTDOWN CMD
*/
-if (jk_b_append_byte(msg, AJP14_SHUTDOWN_CMD))
+if (jk_b_append_byte(msg, AJP14_SHUTDOWN_CMD)) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
-
+}
/*
* COMPUTED-SEED
*/
@@ -261,7 +272,8 @@
(msg, (const unsigned char *)s-computed_key,
AJP14_COMPUTED_KEY_LEN)) {
jk_log(l, JK_LOG_ERROR,
- Error ajp14_marshal_shutdown_into_msgb - Error appending the
COMPUTED MD5 bytes\n);
+ failed appending the COMPUTED MD5 bytes\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -286,7 +298,8 @@
if (status == 0x) {
jk_log(l, JK_LOG_ERROR,
- Error ajp14_unmarshal_shutdown_nok - can't get failure
code\n);
+ can't get failure code\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -316,22 +329,25 @@
/*
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp14_worker.c
mturk 2004/11/11 09:52:04
Modified:jk/native/common jk_ajp14_worker.c
Log:
Add new trace macros and clean up some log messages.
Revision ChangesPath
1.22 +92 -45
jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c
Index: jk_ajp14_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp14_worker.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- jk_ajp14_worker.c 8 Oct 2004 07:50:39 - 1.21
+++ jk_ajp14_worker.c 11 Nov 2004 17:52:04 - 1.22
@@ -47,46 +47,53 @@
char *buf;
#ifndef TESTME
+JK_TRACE_ENTER(l);
ajp14_marshal_context_query_into_msgb(msg, we-virtual, l);
-jk_log(l, JK_LOG_DEBUG, Into ajp14:discovery - send query\n);
+jk_log(l, JK_LOG_DEBUG, send query\n);
-if (ajp_connection_tcp_send_message(ae, msg, l) != JK_TRUE)
+if (ajp_connection_tcp_send_message(ae, msg, l) != JK_TRUE) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
-
-jk_log(l, JK_LOG_DEBUG, Into ajp14:discovery - wait context reply\n);
+}
+jk_log(l, JK_LOG_DEBUG, wait context reply\n);
jk_b_reset(msg);
-if (ajp_connection_tcp_get_message(ae, msg, l) != JK_TRUE)
+if (ajp_connection_tcp_get_message(ae, msg, l) != JK_TRUE) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
-
+}
if ((cmd = jk_b_get_byte(msg)) != AJP14_CONTEXT_INFO_CMD) {
jk_log(l, JK_LOG_ERROR,
- Error ajp14:discovery - awaited command %d, received %d\n,
+ awaited command %d, received %d\n,
AJP14_CONTEXT_INFO_CMD, cmd);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
if (context_alloc(c, we-virtual) != JK_TRUE) {
jk_log(l, JK_LOG_ERROR,
- Error ajp14:discovery - can't allocate context room\n);
+ can't allocate context room\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
if (ajp14_unmarshal_context_info(msg, c, l) != JK_TRUE) {
jk_log(l, JK_LOG_ERROR,
- Error ajp14:discovery - can't get context reply\n);
+ can't get context reply\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
-jk_log(l, JK_LOG_DEBUG, Into ajp14:discovery - received context\n);
+jk_log(l, JK_LOG_DEBUG, received context\n);
buf = malloc(MAX_URI_SIZE); /* Really a very long URI */
if (!buf) {
-jk_log(l, JK_LOG_ERROR, Error ajp14:discovery - can't alloc buf\n);
+jk_log(l, JK_LOG_ERROR, can't malloc buf\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -101,7 +108,7 @@
#endif
jk_log(l, JK_LOG_INFO,
- Into ajp14:discovery - worker %s will handle uri %s in
context %s [%s]\n,
+ worker %s will handle uri %s in context %s [%s]\n,
ae-worker-name, ci-uris[j], ci-cbase, buf);
uri_worker_map_add(we-uri_to_worker, buf, ae-worker-name, l);
@@ -122,6 +129,7 @@
#endif
+JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -137,47 +145,55 @@
int cmd;
jk_login_service_t *jl = ae-worker-login;
+JK_TRACE_ENTER(l);
ajp14_marshal_login_init_into_msgb(msg, jl, l);
-jk_log(l, JK_LOG_DEBUG, Into ajp14:logon - send init\n);
+jk_log(l, JK_LOG_DEBUG, send init\n);
-if (ajp_connection_tcp_send_message(ae, msg, l) != JK_TRUE)
+if (ajp_connection_tcp_send_message(ae, msg, l) != JK_TRUE) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
-
-jk_log(l, JK_LOG_DEBUG, Into ajp14:logon - wait init reply\n);
+}
+jk_log(l, JK_LOG_DEBUG, wait init reply\n);
jk_b_reset(msg);
-if (ajp_connection_tcp_get_message(ae, msg, l) != JK_TRUE)
+if (ajp_connection_tcp_get_message(ae, msg, l) != JK_TRUE) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
-
+}
if ((cmd = jk_b_get_byte(msg)) != AJP14_LOGSEED_CMD) {
jk_log(l, JK_LOG_ERROR,
- Error ajp14:logon: awaited command %d, received %d\n,
+ awaited command %d, received %d\n,
AJP14_LOGSEED_CMD, cmd);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
-if (ajp14_unmarshal_login_seed(msg, jl, l) != JK_TRUE)
+if (ajp14_unmarshal_login_seed(msg, jl, l) != JK_TRUE) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
-
-jk_log(l, JK_LOG_DEBUG, Into ajp14:logon - received entropy %s\n,
+}
+jk_log(l, JK_LOG_DEBUG, received entropy %s\n,
jl-entropy);
ajp14_compute_md5(jl, l);
-if (ajp14_marshal_login_comp_into_msgb(msg, jl, l) != JK_TRUE)
+if
DO NOT REPLY [Bug 4543] - RMI fails if tomcat is installed in directory with white space
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=4543. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=4543 RMI fails if tomcat is installed in directory with white space --- Additional Comments From [EMAIL PROTECTED] 2004-11-11 18:04 --- Created an attachment (id=13405) clean work-around with need for security policy input - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_ajp_common.c
mturk 2004/11/11 10:26:57
Modified:jk/native/common jk_ajp_common.c
Log:
Add new trace macros and clean up some log messages.
Needs more work on logging for recoverable operations.
Revision ChangesPath
1.61 +190 -121
jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c
Index: jk_ajp_common.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_ajp_common.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- jk_ajp_common.c 8 Nov 2004 13:37:46 - 1.60
+++ jk_ajp_common.c 11 Nov 2004 18:26:57 - 1.61
@@ -293,12 +293,13 @@
unsigned char method;
unsigned i;
-jk_log(l, JK_LOG_DEBUG, Into ajp_marshal_into_msgb\n);
+JK_TRACE_ENTER(l);
if (!sc_for_req_method(s-method, method)) {
jk_log(l, JK_LOG_ERROR,
- Error ajp_marshal_into_msgb - No such method %s\n,
+ No such method %s\n,
s-method);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -314,8 +315,8 @@
jk_b_append_int(msg, (unsigned short)(s-num_headers))) {
jk_log(l, JK_LOG_ERROR,
- Error ajp_marshal_into_msgb -
- Error appending the message begining\n);
+ failed appending the message begining\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -325,24 +326,24 @@
if (sc_for_req_header(s-headers_names[i], sc)) {
if (jk_b_append_int(msg, sc)) {
jk_log(l, JK_LOG_ERROR,
- Error ajp_marshal_into_msgb -
- Error appending the header name\n);
+ failed appending the header name\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
}
else {
if (jk_b_append_string(msg, s-headers_names[i])) {
jk_log(l, JK_LOG_ERROR,
- Error ajp_marshal_into_msgb -
- Error appending the header name\n);
+ failed appending the header name\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
}
if (jk_b_append_string(msg, s-headers_values[i])) {
jk_log(l, JK_LOG_ERROR,
- Error ajp_marshal_into_msgb -
- Error appending the header value\n);
+ failed appending the header value\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
}
@@ -351,8 +352,8 @@
if (jk_b_append_byte(msg, SC_A_SECRET) ||
jk_b_append_string(msg, s-secret)) {
jk_log(l, JK_LOG_ERROR,
- Error ajp_marshal_into_msgb -
- Error appending secret\n);
+ failed appending secret\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
}
@@ -361,8 +362,8 @@
if (jk_b_append_byte(msg, SC_A_REMOTE_USER) ||
jk_b_append_string(msg, s-remote_user)) {
jk_log(l, JK_LOG_ERROR,
- Error ajp_marshal_into_msgb -
- Error appending the remote user\n);
+ failed appending the remote user\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
}
@@ -370,8 +371,8 @@
if (jk_b_append_byte(msg, SC_A_AUTH_TYPE) ||
jk_b_append_string(msg, s-auth_type)) {
jk_log(l, JK_LOG_ERROR,
- Error ajp_marshal_into_msgb -
- Error appending the auth type\n);
+ failed appending the auth type\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
}
@@ -383,8 +384,8 @@
jk_b_append_string(msg, s-query_string)) {
#endif
jk_log(l, JK_LOG_ERROR,
- Error ajp_marshal_into_msgb -
- Error appending the query string\n);
+ failed appending the query string\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
}
@@ -392,8 +393,8 @@
if (jk_b_append_byte(msg, SC_A_JVM_ROUTE) ||
jk_b_append_string(msg, s-jvm_route)) {
jk_log(l, JK_LOG_ERROR,
- Error ajp_marshal_into_msgb -
- Error appending the jvm route\n);
+ failed appending the jvm route\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
}
@@ -401,8 +402,8 @@
if (jk_b_append_byte(msg, SC_A_SSL_CERT) ||
jk_b_append_string(msg, s-ssl_cert)) {
jk_log(l,
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_connect.c
mturk 2004/11/11 10:34:36
Modified:jk/native/common jk_connect.c
Log:
Add new trace macros and clean up some log messages.
Revision ChangesPath
1.31 +15 -11jakarta-tomcat-connectors/jk/native/common/jk_connect.c
Index: jk_connect.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_connect.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- jk_connect.c 10 Nov 2004 16:36:48 - 1.30
+++ jk_connect.c 11 Nov 2004 18:34:36 - 1.31
@@ -149,13 +149,14 @@
ret = jk_socket_timeout_set(sock, -1, timeout);
if (ret) {
jk_close_socket(sock);
-jk_log(l, JK_LOG_INFO,
- jk_open_socket, timeout_set failed errno = %d\n,
+jk_log(l, JK_LOG_ERROR,
+ timeout_set failed with errno = %d\n,
ret);
+JK_TRACE_EXIT(l);
return -1;
}
jk_log(l, JK_LOG_DEBUG,
-jk_open_socket, set timeout to %d with status %d\n,
+set timeout to %d with status %d\n,
timeout, ret);
}
@@ -163,7 +164,7 @@
/* Tries to connect to Tomcat (continues trying while error is
EINTR) */
do {
jk_log(l, JK_LOG_DEBUG,
- jk_open_socket, try to connect socket = %d to %s\n,
sock,
+ try to connect socket = %d to %s\n, sock,
jk_dump_hinfo(addr, buf));
/* Need more infos for BSD 4.4 and Unix 98 defines, for now only
@@ -180,14 +181,15 @@
}
#endif /* WIN32 */
jk_log(l, JK_LOG_DEBUG,
- jk_open_socket, after connect ret = %d\n, ret);
+ after connect ret = %d\n, ret);
} while (-1 == ret EINTR == errno);
/* Check if we connected */
if (ret == -1) {
jk_log(l, JK_LOG_INFO,
- jk_open_socket, connect() failed errno = %d\n, errno);
+ connect() failed errno = %d\n, errno);
jk_close_socket(sock);
+JK_TRACE_EXIT(l);
return -1;
}
if (ndelay) {
@@ -211,8 +213,9 @@
sizeof(len))) {
JK_GET_SOCKET_ERRNO();
jk_log(l, JK_LOG_ERROR,
- ERROR: jk_open_socket, failed setting sndbuf errno =
%d\n, errno);
+ failed setting sndbuf errno = %d\n, errno);
jk_close_socket(sock);
+JK_TRACE_EXIT(l);
return -1;
}
/* Set socket receive buffer size */
@@ -220,18 +223,19 @@
sizeof(len))) {
JK_GET_SOCKET_ERRNO();
jk_log(l, JK_LOG_ERROR,
- ERROR: jk_open_socket, failed setting rcvbuf errno =
%d\n, errno);
+ failed setting rcvbuf errno = %d\n, errno);
jk_close_socket(sock);
+JK_TRACE_EXIT(l);
return -1;
}
-jk_log(l, JK_LOG_DEBUG, jk_open_socket, return, sd = %d\n,
+jk_log(l, JK_LOG_DEBUG, connected sd = %d\n,
sock);
}
else {
JK_GET_SOCKET_ERRNO();
jk_log(l, JK_LOG_ERROR,
- jk_open_socket, socket() failed errno = %d\n, errno);
+ socket() failed with errno = %d\n, errno);
}
JK_TRACE_EXIT(l);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_lb_worker.c
mturk 2004/11/11 10:43:07
Modified:jk/native/common jk_lb_worker.c
Log:
Add new trace macros and clean up some log messages.
Revision ChangesPath
1.29 +12 -5 jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c
Index: jk_lb_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_lb_worker.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- jk_lb_worker.c11 Nov 2004 09:45:23 - 1.28
+++ jk_lb_worker.c11 Nov 2004 18:43:07 - 1.29
@@ -337,7 +337,8 @@
*/
jk_log(l, JK_LOG_ERROR,
lb: unrecoverable error, request failed. Tomcat
failed in the middle of request, we can't recover to another instance.\n);
-break;
+JK_TRACE_EXIT(l);
+return JK_FALSE;
}
/*
@@ -351,13 +352,14 @@
/* NULL record, no more workers left ... */
jk_log(l, JK_LOG_ERROR,
lb: All tomcat instances failed, no more workers
left.\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
-break;
}
}
}
jk_log(l, JK_LOG_ERROR, lb: end of service with error\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -379,7 +381,7 @@
}
JK_LOG_NULL_PARAMS(l);
-
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -409,6 +411,7 @@
sizeof(worker_record_t));
if (!p-lb_workers) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -460,7 +463,7 @@
if (i != num_of_workers) {
close_workers(p, i, l);
jk_log(l, JK_LOG_DEBUG,
- In jk_worker_t::validate: Failed to create worker
%s\n,
+ Failed to create worker %s\n,
p-lb_workers[i].name);
}
@@ -484,6 +487,7 @@
}
JK_LOG_NULL_PARAMS(l);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -516,6 +520,7 @@
JK_LOG_NULL_PARAMS(l);
}
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -536,6 +541,7 @@
}
JK_LOG_NULL_PARAMS(l);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -570,5 +576,6 @@
JK_LOG_NULL_PARAMS(l);
}
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_jni_worker.c
mturk 2004/11/11 11:00:57
Modified:jk/native/common jk_jni_worker.c
Log:
Add new trace macros and clean up some log messages.
Revision ChangesPath
1.27 +116 -76
jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c
Index: jk_jni_worker.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_jni_worker.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- jk_jni_worker.c 8 Oct 2004 07:50:39 - 1.26
+++ jk_jni_worker.c 11 Nov 2004 19:00:56 - 1.27
@@ -253,16 +253,17 @@
jni_endpoint_t *p;
jint rc;
-jk_log(l, JK_LOG_DEBUG, Into service\n);
+JK_TRACE_ENTER(l);
if (!e || !e-endpoint_private || !s) {
-jk_log(l, JK_LOG_EMERG,
- In service, assert failed - invalid parameters\n);
+JK_LOG_NULL_PARAMS(l);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
p = e-endpoint_private;
if (!is_recoverable_error) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -272,6 +273,7 @@
jk_log(l, JK_LOG_EMERG, Attach failed\n);
/* Is it recoverable ?? */
*is_recoverable_error = JK_TRUE;
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
p-attached = JK_TRUE;
@@ -301,11 +303,13 @@
/* [V] Righ now JNIEndpoint::service() only returns 1 or 0 */
if (rc) {
-jk_log(l, JK_LOG_DEBUG, In service, Tomcat returned OK, done\n);
+jk_log(l, JK_LOG_DEBUG, Tomcat returned OK, done\n);
+JK_TRACE_EXIT(l);
return JK_TRUE;
}
else {
-jk_log(l, JK_LOG_ERROR, In service, Tomcat FAILED!\n);
+jk_log(l, JK_LOG_ERROR, Tomcat FAILED!\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
}
@@ -314,10 +318,10 @@
{
jni_endpoint_t *p;
-jk_log(l, JK_LOG_DEBUG, Into done\n);
+JK_TRACE_ENTER(l);
if (!e || !*e || !(*e)-endpoint_private) {
-jk_log(l, JK_LOG_EMERG,
- In done, assert failed - invalid parameters\n);
+JK_LOG_NULL_PARAMS(l);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -329,7 +333,7 @@
free(p);
*e = NULL;
-jk_log(l, JK_LOG_DEBUG, Done ok\n);
+JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -343,18 +347,19 @@
char *str_config = NULL;
JNIEnv *env;
-jk_log(l, JK_LOG_DEBUG, Into validate\n);
+JK_TRACE_ENTER(l);
if (!pThis || !pThis-worker_private) {
-jk_log(l, JK_LOG_EMERG,
- In validate, assert failed - invalid parameters\n);
+JK_LOG_NULL_PARAMS(l);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
p = pThis-worker_private;
if (p-was_verified) {
-jk_log(l, JK_LOG_DEBUG, validate, been here before, done\n);
+jk_log(l, JK_LOG_DEBUG, been here before, done\n);
+JK_TRACE_EXIT(l);
return JK_TRUE;
}
@@ -371,7 +376,8 @@
}
if (!p-tomcat_classpath) {
-jk_log(l, JK_LOG_EMERG, Fail- no classpath\n);
+jk_log(l, JK_LOG_EMERG, no classpath\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -384,7 +390,8 @@
}
if (!p-jvm_dll_path || !jk_file_exists(p-jvm_dll_path)) {
-jk_log(l, JK_LOG_EMERG, Fail- no jvm_dll_path\n);
+jk_log(l, JK_LOG_EMERG, no jvm_dll_path\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -419,36 +426,39 @@
}
if (!load_jvm_dll(p, l)) {
-jk_log(l, JK_LOG_EMERG, Fail- can't load jvm dll\n);
+jk_log(l, JK_LOG_EMERG, can't load jvm dll\n);
/* [V] no detach needed here */
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
if (!open_jvm(p, env, l)) {
-jk_log(l, JK_LOG_EMERG, Fail- can't open jvm\n);
+jk_log(l, JK_LOG_EMERG, can't open jvm\n);
/* [V] no detach needed here */
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
if (!get_bridge_object(p, env, l)) {
-jk_log(l, JK_LOG_EMERG, Fail- can't get bridge object\n);
+jk_log(l, JK_LOG_EMERG, can't get bridge object\n);
/* [V] the detach here may segfault on 1.1 JVM... */
detach_from_jvm(p, l);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
if (!get_method_ids(p, env, l)) {
-jk_log(l, JK_LOG_EMERG, Fail- can't get method ids\n);
+jk_log(l, JK_LOG_EMERG, can't get method ids\n);
/* [V] the detach here may segfault on 1.1 JVM... */
detach_from_jvm(p, l);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_uri_worker_map.c jk_worker.c
mturk 2004/11/11 11:11:56
Modified:jk/native/common jk_uri_worker_map.c jk_worker.c
Log:
Add new trace macros and clean up some log messages.
Revision ChangesPath
1.28 +20 -7
jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c
Index: jk_uri_worker_map.c
===
RCS file:
/home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_uri_worker_map.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- jk_uri_worker_map.c 11 Nov 2004 09:45:23 - 1.27
+++ jk_uri_worker_map.c 11 Nov 2004 19:11:55 - 1.28
@@ -136,13 +136,16 @@
JK_TRACE_ENTER(l);
if (init_data uw_map) {
-return uri_worker_map_open(*uw_map =
- (jk_uri_worker_map_t *)
- malloc(sizeof(jk_uri_worker_map_t)),
- init_data, l);
+int rc = uri_worker_map_open(*uw_map =
+ (jk_uri_worker_map_t *)
+ malloc(sizeof(jk_uri_worker_map_t)),
+ init_data, l);
+JK_TRACE_EXIT(l);
+return rc;
}
JK_LOG_NULL_PARAMS(l);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -161,6 +164,7 @@
else
JK_LOG_NULL_PARAMS(l);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -204,9 +208,10 @@
char *worker;
JK_TRACE_ENTER(l);
-if (uri_worker_map_realloc(uw_map) == JK_FALSE)
+if (uri_worker_map_realloc(uw_map) == JK_FALSE) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
-
+}
uwr =
(uri_worker_record_t *) jk_pool_alloc(uw_map-p,
sizeof(uri_worker_record_t));
@@ -214,6 +219,7 @@
if (!uwr) {
jk_log(l, JK_LOG_ERROR,
can't alloc map entry\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -223,6 +229,7 @@
if (!uri || !worker) {
jk_log(l, JK_LOG_ERROR,
can't alloc uri/worker strings\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -235,6 +242,7 @@
if (!uwr-uri) {
jk_log(l, JK_LOG_ERROR,
can't alloc uri string\n);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -326,6 +334,7 @@
jk_log(l, JK_LOG_ERROR,
invalid context %s\n,
uri);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -423,6 +432,7 @@
}
JK_LOG_NULL_PARAMS(l);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -482,6 +492,7 @@
jk_log(l, JK_LOG_DEBUG,
Found an exact match %s - %s\n,
uwr-worker_name, uwr-context);
+JK_TRACE_EXIT(l);
return uwr-worker_name;
}
}
@@ -554,6 +565,7 @@
}
if (-1 != best_match) {
+JK_TRACE_EXIT(l);
return uw_map-maps[best_match]-worker_name;
}
else {
@@ -571,6 +583,7 @@
jk_log(l, JK_LOG_EMERG,
Found a security fraud in '%s'\n,
uri);
+JK_TRACE_EXIT(l);
return uw_map-maps[fraud]-worker_name;
}
}
1.23 +16 -7 jakarta-tomcat-connectors/jk/native/common/jk_worker.c
Index: jk_worker.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_worker.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- jk_worker.c 11 Nov 2004 09:45:23 - 1.22
+++ jk_worker.c 11 Nov 2004 19:11:56 - 1.23
@@ -43,15 +43,18 @@
JK_TRACE_ENTER(l);
if (!jk_map_alloc(worker_map)) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
if (!jk_get_worker_list(init_data, worker_list, num_of_workers)) {
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
if (!build_worker_map(init_data, worker_list, num_of_workers, we, l)) {
close_workers(l);
+JK_TRACE_EXIT(l);
return JK_FALSE;
}
@@ -75,15 +78,15 @@
JK_TRACE_ENTER(l);
if (!name) {
-jk_log(l, JK_LOG_ERROR, wc_get_worker_for_name NULL name\n);
+JK_LOG_NULL_PARAMS(l);
+JK_TRACE_EXIT(l);
+return NULL;
}
-jk_log(l, JK_LOG_DEBUG, Into wc_get_worker_for_name %s\n, name);
-
rc
RE: FW: Building isapi_redirector2.dll Win32 Release
Can you please identify which versions of each you used to build the version of the dll at http://jakarta.apache.org/~mturk/? Equally important, can you identify the CVS head you used? Thanks, Derrick -Original Message- From: Mladen Turk [mailto:[EMAIL PROTECTED] Sent: Monday, November 08, 2004 10:50 AM To: Tomcat Developers List Subject: Re: FW: Building isapi_redirector2.dll Win32 Release Derrick Koes wrote: I *may* be able to fix some of the errors with jk_isapi_plugin.c myself, but does anyone know where pcre.h exists? Yes, I know about M. Turk's dll http://jakarta.apache.org/~mturk/, but I'd like to be able to build the fix myself. Hi Derrick, JK2 is officially unsupported. Regarding your builds... You will need MSSDK 2003, apr, apr-util, apr-iconv and pcre from Apache2, as well as J2SDK. The SDK includes should precede the one from MSVC6. You see... Too much to maintain. Regards, MT. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
RE: TCK questions
Hi, OK, thanks for finding these out ;) Yoav Shapira http://www.yoavshapira.com -Original Message- From: Amy Roh [mailto:[EMAIL PROTECTED] Sent: Wednesday, November 10, 2004 5:34 PM To: Tomcat Developers List Subject: Re: TCK questions Here are my findings after talking to compatibility folks. TCK reports just like the TCK are under NDA and cannot be posted to any public website, newsgroup, etc. Only ASF members who are covered by NDA is allowed to see the test results. Geir is the person who understands this well and is the ASF liason. The only ASF people that can run the TCKS are those who have the correct NDAs. Geir has this information. The TCKs cannot be run on a box that is accessible by non-NDA ASF members. Hope this helps. Thanks, Amy - Original Message - From: Shapira, Yoav [EMAIL PROTECTED] To: Tomcat Developers List [EMAIL PROTECTED] Sent: Wednesday, November 10, 2004 6:03 AM Subject: TCK questions Hi, I have two questions regarding the Servlet and JSP TCKs that you (the powers that be) run for us on Tomcat releases (thanks again ;)). 1. When you run the TCKs, is there a report produced? If so, what's its format and can it posted to this list? 2. I know the TCK scholarship for the Servlet and JSP JSRs was granted to the ASF, so theoretically (and I don't really want to do this at the moment, just asking) we should be able to run the TCKs ourselves assuming a proper authentication approach was taken (i.e. only run on minotaur.apache.org, testing org.apache code, etc.)? Thanks, Yoav Shapira http://www.yoavshapira.com This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] This e-mail, including any attachments, is a confidential business communication, and may contain information that is confidential, proprietary and/or privileged. This e-mail is intended only for the individual(s) to whom it is addressed, and may not be saved, copied, printed, disclosed or used by anyone else. If you are not the(an) intended recipient, please immediately delete this e-mail from your computer system and notify the sender. Thank you. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 13723] - Tom Cat does not start
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=13723. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=13723 Tom Cat does not start [EMAIL PROTECTED] changed: What|Removed |Added CC||[EMAIL PROTECTED] OS/Version|Windows 9x |Windows NT/2K Platform|Other |PC Summary||Tom Cat does not start Version|Unknown |5.5.4 --- Additional Comments From [EMAIL PROTECTED] 2004-11-11 21:34 --- I installed the Apache Tomcat application server on a windows 2000 advanced server PC with service pack 3. When I tried to start the application via the configuration tool, the configuration tool's start button indicates that the application has started but there is nothing binding to port 8080 (the tomcat admin port). In addition I am not able to connect to http://127.0.0.1:8080. Finally when I check the tomcat log files there is nothing in stderr.log or stdout.log files but the jakarta_service_2004.log file contains the following data below. [2004-11-11 15:34:37] [info] Service Tomcat5 name Apache Tomcat [2004-11-11 15:34:38] [info] Service Tomcat5 installed [2004-11-11 15:34:38] [info] Procrun finished. [2004-11-11 15:34:38] [info] Updating service... [2004-11-11 15:34:39] [info] Service Tomcat5 updated [2004-11-11 15:34:39] [info] Update service finished. [2004-11-11 15:34:39] [info] Procrun finished. [2004-11-11 15:34:44] [info] Updating service... [2004-11-11 15:34:44] [info] Service Tomcat5 updated [2004-11-11 15:34:44] [info] Update service finished. [2004-11-11 15:34:44] [info] Procrun finished. [2004-11-11 15:34:45] [info] Updating service... [2004-11-11 15:34:45] [info] Service Tomcat5 updated [2004-11-11 15:34:45] [info] Update service finished. [2004-11-11 15:34:45] [info] Procrun finished. [2004-11-11 15:34:49] [info] Running Service... [2004-11-11 15:34:49] [info] Starting service... [2004-11-11 15:34:52] [info] Service started in 2484 ms. [2004-11-11 15:34:56] [info] Run service finished. [2004-11-11 15:34:56] [info] Procrun finished. [2004-11-11 15:40:28] [info] Running Service... [2004-11-11 15:40:28] [info] Starting service... [2004-11-11 15:40:29] [info] Service started in 1265 ms. [2004-11-11 15:40:33] [info] Run service finished. [2004-11-11 15:40:33] [info] Procrun finished. [2004-11-11 15:43:02] [info] Running Service... [2004-11-11 15:43:02] [info] Starting service... [2004-11-11 15:43:13] [info] Service started in 11234 ms. [2004-11-11 15:43:21] [info] Run service finished. [2004-11-11 15:43:21] [info] Procrun finished. [2004-11-11 15:45:30] [info] Running Service... [2004-11-11 15:45:30] [info] Starting service... [2004-11-11 15:45:31] [info] Service started in 1265 ms. [2004-11-11 15:45:35] [info] Run service finished. [2004-11-11 15:45:35] [info] Procrun finished. [2004-11-11 15:49:18] [1193 prunsrv.c] [debug] Procrun log initialized [2004-11-11 15:49:18] [info] Running Service... [2004-11-11 15:49:18] [1036 prunsrv.c] [debug] Inside ServiceMain... [2004-11-11 15:49:18] [info] Starting service... [2004-11-11 15:49:18] [408 javajni.c] [debug] Jvm Option[0] -Dcatalina.home=C:\Program Files\Apache Software Foundation\Tomcat 5.5 [2004-11-11 15:49:18] [408 javajni.c] [debug] Jvm Option[1] -Djava.endorsed.dirs=C:\Program Files\Apache Software Foundation\Tomcat 5.5\common\endorsed [2004-11-11 15:49:18] [408 javajni.c] [debug] Jvm Option[2] -Djava.io.tmpdir=C:\Program Files\Apache Software Foundation\Tomcat 5.5\temp [2004-11-11 15:49:18] [408 javajni.c] [debug] Jvm Option[3] -Xrs [2004-11-11 15:49:18] [408 javajni.c] [debug] Jvm Option[4] -Djava.class.path=C:\Program Files\Apache Software Foundation\Tomcat 5.5\bin\bootstrap.jar [2004-11-11 15:49:18] [408 javajni.c] [debug] Jvm Option[5] vfprintf [2004-11-11 15:49:19] [494 javajni.c] [debug] argv[0] = start [2004-11-11 15:49:20] [907 prunsrv.c] [debug] Java started org/apache/catalina/startup/Bootstrap [2004-11-11 15:49:20] [info] Service started in 1250 ms. [2004-11-11 15:49:20] [1110 prunsrv.c] [debug] Waitning worker to finish... [2004-11-11 15:49:24] [531 javajni.c] [debug] Java Worker thread finished [2004-11-11 15:49:24] [1115 prunsrv.c] [debug] Worker finished. [2004-11-11 15:49:24] [info] Run service finished. [2004-11-11 15:49:24] [info] Procrun finished. [2004-11-11 16:04:56] [1193 prunsrv.c] [debug] Procrun log initialized [2004-11-11 16:04:56] [info] Running Service... [2004-11-11 16:04:56] [1036 prunsrv.c] [debug] Inside ServiceMain... [2004-11-11 16:04:56] [info] Starting service... [2004-11-11 16:04:56] [408 javajni.c] [debug] Jvm
DO NOT REPLY [Bug 32194] New: - Apache Tomcat will not start on win 2000/adv server with services pack 3
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32194. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32194 Apache Tomcat will not start on win 2000/adv server with services pack 3 Summary: Apache Tomcat will not start on win 2000/adv server with services pack 3 Product: Tomcat 5 Version: 5.5.4 Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Normal Priority: Other Component: Catalina AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] I installed the Apache Tomcat application server on a windows 2000 advanced server PC with service pack 3. When I tried to start the application via the configuration tool, the configuration tool's start button indicates that the application has started but there is nothing binding to port 8080 (the tomcat admin port). In addition I am not able to connect to http://127.0.0.1:8080. Finally when I check the tomcat log files there is nothing in stderr.log or stdout.log files but the jakarta_service_2004.log file contains the following data below. [2004-11-11 15:34:37] [info] Service Tomcat5 name Apache Tomcat [2004-11-11 15:34:38] [info] Service Tomcat5 installed [2004-11-11 15:34:38] [info] Procrun finished. [2004-11-11 15:34:38] [info] Updating service... [2004-11-11 15:34:39] [info] Service Tomcat5 updated [2004-11-11 15:34:39] [info] Update service finished. [2004-11-11 15:34:39] [info] Procrun finished. [2004-11-11 15:34:44] [info] Updating service... [2004-11-11 15:34:44] [info] Service Tomcat5 updated [2004-11-11 15:34:44] [info] Update service finished. [2004-11-11 15:34:44] [info] Procrun finished. [2004-11-11 15:34:45] [info] Updating service... [2004-11-11 15:34:45] [info] Service Tomcat5 updated [2004-11-11 15:34:45] [info] Update service finished. [2004-11-11 15:34:45] [info] Procrun finished. [2004-11-11 15:34:49] [info] Running Service... [2004-11-11 15:34:49] [info] Starting service... [2004-11-11 15:34:52] [info] Service started in 2484 ms. [2004-11-11 15:34:56] [info] Run service finished. [2004-11-11 15:34:56] [info] Procrun finished. [2004-11-11 15:40:28] [info] Running Service... [2004-11-11 15:40:28] [info] Starting service... [2004-11-11 15:40:29] [info] Service started in 1265 ms. [2004-11-11 15:40:33] [info] Run service finished. [2004-11-11 15:40:33] [info] Procrun finished. [2004-11-11 15:43:02] [info] Running Service... [2004-11-11 15:43:02] [info] Starting service... [2004-11-11 15:43:13] [info] Service started in 11234 ms. [2004-11-11 15:43:21] [info] Run service finished. [2004-11-11 15:43:21] [info] Procrun finished. [2004-11-11 15:45:30] [info] Running Service... [2004-11-11 15:45:30] [info] Starting service... [2004-11-11 15:45:31] [info] Service started in 1265 ms. [2004-11-11 15:45:35] [info] Run service finished. [2004-11-11 15:45:35] [info] Procrun finished. [2004-11-11 15:49:18] [1193 prunsrv.c] [debug] Procrun log initialized [2004-11-11 15:49:18] [info] Running Service... [2004-11-11 15:49:18] [1036 prunsrv.c] [debug] Inside ServiceMain... [2004-11-11 15:49:18] [info] Starting service... [2004-11-11 15:49:18] [408 javajni.c] [debug] Jvm Option[0] -Dcatalina.home=C:\Program Files\Apache Software Foundation\Tomcat 5.5 [2004-11-11 15:49:18] [408 javajni.c] [debug] Jvm Option[1] -Djava.endorsed.dirs=C:\Program Files\Apache Software Foundation\Tomcat 5.5\common\endorsed [2004-11-11 15:49:18] [408 javajni.c] [debug] Jvm Option[2] -Djava.io.tmpdir=C:\Program Files\Apache Software Foundation\Tomcat 5.5\temp [2004-11-11 15:49:18] [408 javajni.c] [debug] Jvm Option[3] -Xrs [2004-11-11 15:49:18] [408 javajni.c] [debug] Jvm Option[4] -Djava.class.path=C:\Program Files\Apache Software Foundation\Tomcat 5.5\bin\bootstrap.jar [2004-11-11 15:49:18] [408 javajni.c] [debug] Jvm Option[5] vfprintf [2004-11-11 15:49:19] [494 javajni.c] [debug] argv[0] = start [2004-11-11 15:49:20] [907 prunsrv.c] [debug] Java started org/apache/catalina/startup/Bootstrap [2004-11-11 15:49:20] [info] Service started in 1250 ms. [2004-11-11 15:49:20] [1110 prunsrv.c] [debug] Waitning worker to finish... [2004-11-11 15:49:24] [531 javajni.c] [debug] Java Worker thread finished [2004-11-11 15:49:24] [1115 prunsrv.c] [debug] Worker finished. [2004-11-11 15:49:24] [info] Run service finished. [2004-11-11 15:49:24] [info] Procrun finished. [2004-11-11 16:04:56] [1193 prunsrv.c] [debug] Procrun log initialized [2004-11-11 16:04:56] [info] Running Service... [2004-11-11 16:04:56] [1036 prunsrv.c] [debug] Inside ServiceMain... [2004-11-11 16:04:56] [info] Starting service... [2004-11-11 16:04:56] [408 javajni.c] [debug] Jvm Option[0] -Dcatalina.home=C:\Program Files\Apache Software Foundation\Tomcat 5.5 [2004-11-11
DO NOT REPLY [Bug 32194] - Apache Tomcat will not start on win 2000/adv server with services pack 3
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32194. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32194 Apache Tomcat will not start on win 2000/adv server with services pack 3 [EMAIL PROTECTED] changed: What|Removed |Added Status|NEW |RESOLVED Resolution||INVALID - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 13723] - Tom Cat does not start
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=13723. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=13723 Tom Cat does not start [EMAIL PROTECTED] changed: What|Removed |Added Status|RESOLVED|CLOSED - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Important
-- Virus Warning Message (on uusnwa0n) Found virus WORM_NETSKY.Z in file Textfile.txt .exe (in Textfile.zip) The file is deleted. - Important textfile! -- Virus Warning Message (on uusnwa0n) Textfile.zip is removed from here because it contains a virus. - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup HostConfig.java
remm2004/11/11 16:48:41
Modified:catalina/src/share/org/apache/catalina/startup
HostConfig.java
Log:
- Fix an issue reported on tomcat-user. When a war includes a
/META-INF/context.xml, the autodeployer doesn't handle it correctly.
The cause of the issue is simply that the war and expanded folders were not
properly registered.
Revision ChangesPath
1.49 +41 -20
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
Index: HostConfig.java
===
RCS file:
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- HostConfig.java 5 Oct 2004 17:12:49 - 1.48
+++ HostConfig.java 12 Nov 2004 00:48:41 - 1.49
@@ -588,29 +588,35 @@
}
}
host.addChild(context);
+// Get paths for WAR and expanded WAR in appBase
+String name = null;
+String path = context.getPath();
+if (path.equals()) {
+name = ROOT;
+} else {
+if (path.startsWith(/)) {
+name = path.substring(1);
+} else {
+name = path;
+}
+}
+File expandedDocBase = new File(name);
+File warDocBase = new File(name + .war);
+if (!expandedDocBase.isAbsolute()) {
+expandedDocBase = new File(appBase(), name);
+warDocBase = new File(appBase(), name + .war);
+}
// Add the eventual unpacked WAR and all the resources which
will be
// watched inside it
if (isWar unpackWARs) {
-String name = null;
-String path = context.getPath();
-if (path.equals()) {
-name = ROOT;
-} else {
-if (path.startsWith(/)) {
-name = path.substring(1);
-} else {
-name = path;
-}
-}
-File docBase = new File(name);
-if (!docBase.isAbsolute()) {
-docBase = new File(appBase(), name);
-}
-deployedApp.redeployResources.put(docBase.getAbsolutePath(),
-new Long(docBase.lastModified()));
-addWatchedResources(deployedApp, docBase.getAbsolutePath(),
context);
+
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
+new Long(expandedDocBase.lastModified()));
+addWatchedResources(deployedApp,
expandedDocBase.getAbsolutePath(), context);
} else {
if (context.getDocBase() != null) {
+// If the context is outside of the Host appBase,
removing the xml
+// should remove the webapp
+boolean external = false;
File docBase = new File(context.getDocBase());
if (!docBase.isAbsolute()) {
docBase = new File(appBase(), context.getDocBase());
@@ -618,6 +624,7 @@
try {
docBase = docBase.getCanonicalFile();
if
(!docBase.getAbsolutePath().startsWith(appBase().getAbsolutePath())) {
+external = true;
deployedApp.redeployResources.put
(contextXml.getAbsolutePath(), new
Long(contextXml.lastModified()));
deployedApp.reloadResources.remove(contextXml.getAbsolutePath());
@@ -625,8 +632,22 @@
} catch (IOException e) {
// Ignore
}
+if (!external) {
+// Find an existing matching war and expanded folder
+if (warDocBase.exists()) {
+
deployedApp.redeployResources.put(warDocBase.getAbsolutePath(),
+new Long(warDocBase.lastModified()));
+}
+if (expandedDocBase.exists()) {
+
deployedApp.redeployResources.put(expandedDocBase.getAbsolutePath(),
+new
Long(expandedDocBase.lastModified()));
+addWatchedResources(deployedApp,
+expandedDocBase.getAbsolutePath(),
context);
+}
+}
+
Information
-- Virus Warning Message (on uusnwa0l) Found virus WORM_NETSKY.Z in file Data.txt .exe (in Data.zip) The file is deleted. - Important data! -- Virus Warning Message (on uusnwa0l) Data.zip is removed from here because it contains a virus. - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Information
-- Virus Warning Message (on uusnwa08) Found virus WORM_NETSKY.Z in file Informations.txt .exe (in Informations.zip) The file is deleted. - Important informations! -- Virus Warning Message (on uusnwa08) Informations.zip is removed from here because it contains a virus. - - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32196] New: - The Tomcat can't support Linearized PDF
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32196. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32196 The Tomcat can't support Linearized PDF Summary: The Tomcat can't support Linearized PDF Product: Tomcat 4 Version: 4.1.0 Platform: PC OS/Version: Windows NT/2K Status: NEW Severity: Normal Priority: Other Component: Connector:HTTP/1.1 (deprecated) AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] The Tomcat can't support Linearized PDF - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 32196] - The Tomcat can't support Linearized PDF
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://issues.apache.org/bugzilla/show_bug.cgi?id=32196. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://issues.apache.org/bugzilla/show_bug.cgi?id=32196 The Tomcat can't support Linearized PDF --- Additional Comments From [EMAIL PROTECTED] 2004-11-12 06:15 --- On my web site, there have many pdf files. Because the Tomcat can't support Linearized PDF, the client browse them very slowly. How can I do? - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_mt.h jk_util.c
mturk 2004/11/11 23:46:49
Modified:jk/native/common jk_mt.h jk_util.c
Log:
Fix Netware getpid/gettid.
Revision ChangesPath
1.8 +10 -6 jakarta-tomcat-connectors/jk/native/common/jk_mt.h
Index: jk_mt.h
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_mt.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_mt.h 11 Nov 2004 17:04:04 - 1.7
+++ jk_mt.h 12 Nov 2004 07:46:48 - 1.8
@@ -25,6 +25,13 @@
#include jk_global.h
+
+#if defined(WIN32)
+#define jk_gettid()((int)GetCurrentThreadId())
+#elif defined(NETWARE)
+#define jk_gettid()((int)GetThreadID())
+#endif
+
/*
* All WIN32 code is MT, UNIX code that uses pthreads is marked by the POSIX
* _REENTRANT define.
@@ -47,8 +54,6 @@
#define JK_ENTER_CS(x, rc) EnterCriticalSection(x); rc = JK_TRUE;
#define JK_LEAVE_CS(x, rc) LeaveCriticalSection(x); rc = JK_TRUE;
-#define JK_THREADID() ((int)GetCurrentThreadId())
-
#else /* Unix pthreads */
#include pthread.h
@@ -67,8 +72,7 @@
#define JK_LEAVE_CS(x, rc)\
if(pthread_mutex_unlock(x)) rc = JK_FALSE; else rc = JK_TRUE;
-#define JK_THREADID() ((int)pthread_self())
-
+#define jk_gettid() ((int)pthread_self())
#endif /* Unix pthreads */
#else /* Not an MT code */
@@ -79,7 +83,7 @@
#define JK_DELETE_CS(x, rc) rc = JK_TRUE;
#define JK_ENTER_CS(x, rc) rc = JK_TRUE;
#define JK_LEAVE_CS(x, rc) rc = JK_TRUE;
-#define JK_THREADID() 0
+#define jk_gettid() 0
#endif /* Not an MT code */
1.36 +3 -3 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- jk_util.c 11 Nov 2004 17:06:06 - 1.35
+++ jk_util.c 12 Nov 2004 07:46:48 - 1.36
@@ -272,11 +272,11 @@
#ifdef USE_SPRINTF /* until we get a snprintf function */
if (line)
used += sprintf(buf[used], [%d:%d] , getpid(),
-JK_THREADID());
+jk_gettid());
#else
if (line)
used += snprintf(buf[used], HUGE_BUFFER_SIZE, [%d:%d] ,
- getpid(), JK_THREADID());
+ getpid(), jk_gettid());
#endif
if (used 0) {
return 0; /* [V] not sure what to return... */
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-tomcat-connectors/jk/native/common jk_util.c
mturk 2004/11/11 23:52:23
Modified:jk/native/common jk_util.c
Log:
Log PID:TID only when log level is TRACE.
Revision ChangesPath
1.37 +4 -4 jakarta-tomcat-connectors/jk/native/common/jk_util.c
Index: jk_util.c
===
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/common/jk_util.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- jk_util.c 12 Nov 2004 07:46:48 - 1.36
+++ jk_util.c 12 Nov 2004 07:52:23 - 1.37
@@ -269,17 +269,17 @@
set_time_str(buf, HUGE_BUFFER_SIZE);
used = strlen(buf);
+if (l-level == JK_LOG_TRACE_LEVEL) {
#ifdef USE_SPRINTF /* until we get a snprintf function */
-if (line)
used += sprintf(buf[used], [%d:%d] , getpid(),
jk_gettid());
#else
-if (line)
used += snprintf(buf[used], HUGE_BUFFER_SIZE, [%d:%d] ,
getpid(), jk_gettid());
#endif
-if (used 0) {
-return 0; /* [V] not sure what to return... */
+if (used 0) {
+return 0;
+}
}
if (line) {
strcat(buf, jk_level_werbs[level]);
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
