svn commit: r478804 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

[mturk]

Author: mturk
Date: Fri Nov 24 00:48:34 2006
New Revision: 478804

URL: http://svn.apache.org/viewvc?view=revrev=478804
Log:
Handle cping/cpong in case of reconnect if the connect_timeout was set. This 
makes reconnects to
behave like normal connects.

Modified:
tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c?view=diffrev=478804r1=478803r2=478804
==
--- tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c Fri Nov 24 
00:48:34 2006
@@ -1172,7 +1172,7 @@
ae-worker-name, ae-sd, errno);
 jk_close_socket(ae-sd);
 ae-sd = JK_INVALID_SOCKET;
-err=1;
+err = 1;
 }
 if (ae-worker-prepost_timeout  0  !err) {
 /* handle cping/cpong if prepost_timeout is set
@@ -1181,7 +1181,7 @@
  */
 if (ajp_handle_cping_cpong(ae, ae-worker-prepost_timeout, l) ==
 JK_FALSE)
-err=1;
+err = 2;
 }
 
 /* If we got an error or can't send data, then try to get a pooled
@@ -1220,12 +1220,25 @@
(%s) all endpoints are disconnected or dead,
ae-worker-name);
 jk_log(l, JK_LOG_INFO,
-   Increase the backend idle connection timeout or the 
connection_pool_minsize);
+   (%s) increase the backend idle connection timeout or the 
connection_pool_minsize,
+   ae-worker-name);
 }
 /* Connect to the backend.
  * This can be either uninitalized connection or a reconnect.
  */
 if (ajp_connect_to_endpoint(ae, l) == JK_TRUE) {
+/* should we send a CPING to validate connection ? */
+if (ae-worker-connect_timeout  0) {
+if (ajp_handle_cping_cpong(ae,
+ae-worker-connect_timeout, l) == JK_FALSE) {
+/* Close the socket if unable to cping/cpong */
+jk_close_socket(ae-sd);
+ae-sd = JK_INVALID_SOCKET;
+JK_TRACE_EXIT(l);
+return JK_FALSE;
+}
+}
+
 /*
  * After we are connected, each error that we are going to
  * have is probably unrecoverable



-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Re: svn commit: r478804 - /tomcat/connectors/trunk/jk/native/common/jk_ajp_common.c

[Rainer Jung]

Hi Mladen,

[EMAIL PROTECTED] schrieb:
 @@ -1220,12 +1220,25 @@
...
  /* Connect to the backend.
   * This can be either uninitalized connection or a reconnect.
   */
  if (ajp_connect_to_endpoint(ae, l) == JK_TRUE) {
 +/* should we send a CPING to validate connection ? */
 +if (ae-worker-connect_timeout  0) {
 +if (ajp_handle_cping_cpong(ae,
 +ae-worker-connect_timeout, l) == JK_FALSE) {
 +/* Close the socket if unable to cping/cpong */
 +jk_close_socket(ae-sd);
 +ae-sd = JK_INVALID_SOCKET;
 +JK_TRACE_EXIT(l);
 +return JK_FALSE;
 +}
 +}
 +

Cping/Cpong is already done inside ajp_connect_to_endpoint(), if it
fails we take the else part, that does the jk_close_socket. So I think
this would lead to a double cping/cpong after connect.

Regards,

Rainer

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]