costin 02/01/25 22:25:56
Modified: jk/native2/include jk_service.h
Log:
Moved that strange is_recoverable_error in request instead of passing it
as argument to all methods.
The real meaning ( not easy to discover :-) is if the request can be safely
sent to a fallback worker. It is used by lb, but all workers doing active
processing must set it ( or leave a default FALSE ).
Init() method will now use the worker, not the endpoint. It is perfectly
possible to recycle requests or preinit them or anything else - they don't
depend on a particular connection.
( I also added flush, probably not needed but I have a feeling it's missing )
Revision Changes Path
1.8 +16 -2 jakarta-tomcat-connectors/jk/native2/include/jk_service.h
Index: jk_service.h
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/include/jk_service.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- jk_service.h 16 Dec 2001 23:17:23 -0000 1.7
+++ jk_service.h 26 Jan 2002 06:25:56 -0000 1.8
@@ -63,7 +63,7 @@
* Author: Gal Shachor <[EMAIL PROTECTED]> *
* Author: Dan Milstein <[EMAIL PROTECTED]> *
* Author: Henri Gomez <[EMAIL PROTECTED]> *
- * Version: $Revision: 1.7 $ *
+ * Version: $Revision: 1.8 $ *
***************************************************************************/
#ifndef JK_SERVICE_H
@@ -122,6 +122,15 @@
*/
struct jk_ws_service {
struct jk_workerEnv *workerEnv;
+
+ /* JK_TRUE if a 'recoverable' error happened. That means a
+ * lb worker can retry on a different worker, without
+ * loosing any information. If JK_FALSE, an error will be reported
+ * to the client
+ */
+ int is_recoverable_error;
+
+ struct jk_worker *realWorker;
/*
* A 'this' pointer which is used by the subclasses of this class to
@@ -230,7 +239,7 @@
/* Initialize the service structure
*/
int (*init)( struct jk_env *env, jk_ws_service_t *_this,
- struct jk_endpoint *e, void *serverObj);
+ struct jk_worker *w, void *serverObj);
/* Post request cleanup.
*/
@@ -257,6 +266,11 @@
*/
int (JK_METHOD *write)(struct jk_env *env, jk_ws_service_t *s,
const void *buffer, int len);
+
+ /*
+ * Flush the output buffers.
+ */
+ int (JK_METHOD *flush)(struct jk_env *env, jk_ws_service_t *s );
};
#ifdef __cplusplus
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
