costin 02/03/24 11:24:26 Modified: jk/native2/common jk_channel_socket.c jk_config.c jk_env.c jk_uriEnv.c jk_worker_ajp13.c jk_worker_status.c Log: Small fixes, cosmetic changes, move closer to the target documented behavior. ( hopefully the implemented reality and the plan will meet in the midle :-) Revision Changes Path 1.16 +3 -3 jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c Index: jk_channel_socket.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_socket.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- jk_channel_socket.c 18 Mar 2002 18:25:05 -0000 1.15 +++ jk_channel_socket.c 24 Mar 2002 19:24:26 -0000 1.16 @@ -148,7 +148,7 @@ short port=socketInfo->port; if( port<=0 ) - port=8007; + port=8009; if( host==NULL ) host=DEFAULT_HOST; @@ -264,8 +264,8 @@ if(ret != 0 ) { jk2_close_socket(env, sock); env->l->jkLog(env, env->l, JK_LOG_ERROR, - "channelSocket.connect() connect failed %d %s\n", - errno, strerror( errno ) ); + "channelSocket.connect() connect failed %s:%d %d %s \n", + socketInfo->host, socketInfo->port, errno, strerror( errno ) ); return JK_FALSE; } 1.5 +17 -17 jakarta-tomcat-connectors/jk/native2/common/jk_config.c Index: jk_config.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_config.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jk_config.c 23 Mar 2002 17:21:56 -0000 1.4 +++ jk_config.c 24 Mar 2002 19:24:26 -0000 1.5 @@ -58,7 +58,7 @@ /*************************************************************************** * Description: General purpose config object * * Author: Gal Shachor <[EMAIL PROTECTED]> * - * Version: $Revision: 1.4 $ * + * Version: $Revision: 1.5 $ * ***************************************************************************/ #include "jk_global.h" @@ -95,13 +95,13 @@ if (stat(workerFile, &statbuf) == -1) { env->l->jkLog(env, env->l, JK_LOG_ERROR, - "Can't find config file %s", workerFile ); + "config.setConfig(): Can't find config file %s", workerFile ); return JK_FALSE; } /** Read worker files */ - env->l->jkLog(env, env->l, JK_LOG_DEBUG, "Reading config %s %d\n", + env->l->jkLog(env, env->l, JK_LOG_INFO, "config.setConfig(): Reading config %s %d\n", workerFile, cfg->map->size(env, cfg->map) ); jk2_map_default_create(env, &props, wEnv->pool); @@ -110,11 +110,11 @@ if( err==JK_TRUE ) { env->l->jkLog(env, env->l, JK_LOG_INFO, - "mod_jk.initJk() Reading worker properties %s %d\n", + "config.setConfig(): Reading properties %s %d\n", workerFile, props->size( env, props ) ); } else { env->l->jkLog(env, env->l, JK_LOG_ERROR, - "mod_jk.initJk() Error reading worker properties %s\n", + "config.setConfig(): Error reading properties %s\n", workerFile ); return JK_FALSE; } @@ -163,7 +163,7 @@ for( j=0; j < mbean->settings->size( env, mbean->settings ); j++ ) { char *pname=mbean->settings->nameAt( env, mbean->settings, j); /* Don't save redundant information */ - if( strcmp( pname, "name" ) != NULL ) { + if( strcmp( pname, "name" ) != 0 ) { fprintf( fp, "%s=%s\n", pname, mbean->settings->valueAt( env, mbean->settings, j)); @@ -252,27 +252,27 @@ (objName[len] == '\0') ) ) { /* We found the factory. */ type=factName; - env->l->jkLog(env, env->l, JK_LOG_ERROR, - "Found %s %s %s %d %d\n", type, objName, - factName, len, strncmp( objName, factName, len)); + /* env->l->jkLog(env, env->l, JK_LOG_INFO, */ + /* "Found %s %s %s %d %d\n", type, objName, */ + /* factName, len, strncmp( objName, factName, len)); */ break; } } if( type==NULL ) { env->l->jkLog(env, env->l, JK_LOG_ERROR, - "Can't find type for %s \n", objName); + "config.createInstance(): Can't find type for %s \n", objName); return NULL; } workerPool=cfg->pool->create(env, cfg->pool, HUGE_POOL_SIZE); - env->l->jkLog(env, env->l, JK_LOG_ERROR, - "Create %s name=%s\n", type, objName); + env->l->jkLog(env, env->l, JK_LOG_INFO, + "config.createInstance(): Create [%s] %s\n", type, objName); env->createInstance( env, workerPool, type, objName ); w=env->getMBean( env, objName ); if( w==NULL ) { env->l->jkLog(env, env->l, JK_LOG_ERROR, - "Error creating %s %s\n", objName, type); + "config.createInstance(): Error creating [%s] %s\n", objName, type); return NULL; } if( w->settings == NULL ) @@ -303,7 +303,7 @@ strcat( pname, name ); } - fprintf( stderr, "config.setProperty %s %s %s \n", mbean->name, name, val ); + /* fprintf( stderr, "config.setProperty %s %s %s \n", mbean->name, name, val ); */ /** Save it on the config. XXX no support for deleting yet */ /* The _original_ value. Will be saved with $() in it */ @@ -320,8 +320,8 @@ */ cfg->map->add( env, cfg->map, pname, val ); - env->l->jkLog( env, env->l, JK_LOG_ERROR, "config: set %s / %s / %s=%s\n", - mbean->name, name, pname, val); + /* env->l->jkLog( env, env->l, JK_LOG_INFO, "config: set %s / %s / %s=%s\n", */ + /* mbean->name, name, pname, val); */ if(mbean->setAttribute) return mbean->setAttribute( env, mbean, name, val ); @@ -339,7 +339,7 @@ char *objName=NULL; char *propName=NULL; - fprintf( stderr, "setPropertyString %s %s \n", name, value ); + /* fprintf( stderr, "setPropertyString %s %s \n", name, value ); */ status=jk2_config_processBeanPropertyString(env, cfg, name, &objName, &propName ); if( status!=JK_TRUE ) { 1.14 +2 -0 jakarta-tomcat-connectors/jk/native2/common/jk_env.c Index: jk_env.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_env.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- jk_env.c 23 Mar 2002 17:23:15 -0000 1.13 +++ jk_env.c 24 Mar 2002 19:24:26 -0000 1.14 @@ -134,6 +134,8 @@ result->type=type; result->name=name; result->settings=NULL; + result->getAttributeInfo=NULL; + result->setAttributeInfo=NULL; fac( env, pool, result, type, name ); if( result->object==NULL ) { 1.5 +12 -0 jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c Index: jk_uriEnv.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_uriEnv.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- jk_uriEnv.c 23 Mar 2002 17:25:11 -0000 1.4 +++ jk_uriEnv.c 24 Mar 2002 19:24:26 -0000 1.5 @@ -107,6 +107,17 @@ return JK_TRUE; } +static void *jk2_uriEnv_getAttribute(jk_env_t *env, jk_bean_t *bean, + char *name ) +{ + if( strcmp( name, "worker" ) ) { + + } else if( strcmp( name, "reqCount" ) ) { + + } + return NULL; +} + static int jk2_uriEnv_setProperty(jk_env_t *env, jk_bean_t *mbean, char *nameParam, @@ -272,6 +283,7 @@ uriEnv->init=jk2_uriEnv_init; result->setAttribute=&jk2_uriEnv_setProperty; + result->getAttribute=&jk2_uriEnv_getAttribute; uriEnv->mbean=result; result->object=uriEnv; 1.3 +24 -37 jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c Index: jk_worker_ajp13.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_ajp13.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- jk_worker_ajp13.c 23 Mar 2002 17:27:44 -0000 1.2 +++ jk_worker_ajp13.c 24 Mar 2002 19:24:26 -0000 1.3 @@ -109,37 +109,11 @@ } else if( strcmp( name, "lb_factor" )==0 ) { ajp14->lb_factor=atof( value ); } else if( strcmp( name, "channel" )==0 ) { - if( strncmp( value, "channel.", 8 ) != 0 ) { - char *newValue=(char *)ajp14->pool->calloc( env, ajp14->pool, strlen(value) + 10 ); - strcpy( newValue, "channel." ); - strcat( newValue, value ); - env->l->jkLog(env, env->l, JK_LOG_INFO, "ajp14.setProperty() auto replace %s %s\n", - value, newValue); - value=newValue; - } - ajp14->channel=env->createInstance(env, ajp14->pool, value, NULL ); - if( ajp14->channel == NULL ) { - env->l->jkLog(env, env->l, JK_LOG_ERROR, - "Error creating %s channel\n", channelType ); - return JK_FALSE; - } - env->l->jkLog(env, env->l, JK_LOG_INFO, "ajp14.setProperty() channel: %s %s\n", - value,ajp14->channel->mbean->name); - - } else { - /* It's probably a channel property - */ - if( ajp14->channel==NULL ) { - - env->l->jkLog(env, env->l, JK_LOG_ERROR, - "No channel for %s, set channel before other properties %s=%s\n", - mbean->name, name, value ); - return JK_FALSE; - } - - env->l->jkLog(env, env->l, JK_LOG_INFO, "endpoint.setProperty() channel %s=%s\n", - name, value); - ajp14->channel->mbean->setAttribute( env, ajp14->channel->mbean, name, value ); + ajp14->channelName=value; + } else { + env->l->jkLog(env, env->l, JK_LOG_INFO, + "ajp14.setProperty() Unknown property %s %s %s\n", mbean->name, name, value ); + return JK_FALSE; } env->l->jkLog(env, env->l, JK_LOG_INFO, @@ -186,7 +160,8 @@ ae->worker->mbean->name); ae->reuse = JK_FALSE; - ae->worker->channel->close( env, ae->worker->channel, ae ); + if( ae->worker->channel != NULL ) + ae->worker->channel->close( env, ae->worker->channel, ae ); ae->cPool->reset( env, ae->cPool ); ae->cPool->close( env, ae->cPool ); ae->pool->reset( env, ae->pool ); @@ -199,7 +174,15 @@ jk_channel_t *channel=ae->worker->channel; jk_msg_t *msg; - int err=channel->open( env, channel, ae ); + int err; + + if( channel==NULL ) { + env->l->jkLog(env, env->l, JK_LOG_ERROR, + "ajp14.connect() no channel %s\n", ae->worker->mbean->name ); + return JK_FALSE; + } + + err=channel->open( env, channel, ae ); if( err != JK_TRUE ) { env->l->jkLog(env, env->l, JK_LOG_ERROR, @@ -341,6 +324,9 @@ e->post ); } + env->l->jkLog(env, env->l, JK_LOG_INFO, + "ajp14.service() processing callbacks\n"); + err = e->worker->workerEnv->processCallbacks(env, e->worker->workerEnv, e, s); @@ -423,7 +409,7 @@ } env->l->jkLog(env, env->l, JK_LOG_INFO, - "ajp14.service() %s\n", e->worker->mbean->name); + "ajp14.service() %s\n", w->channel->mbean->name); if( w->channel->beforeRequest != NULL ) { w->channel->beforeRequest( env, w->channel, w, e, s ); @@ -436,6 +422,9 @@ err=jk2_worker_ajp14_forwardSingleThread( env, w, s, e ); } + env->l->jkLog(env, env->l, JK_LOG_INFO, + "ajp14.service() done %s\n", e->worker->mbean->name); + if( w->channel->afterRequest != NULL ) { w->channel->afterRequest( env, w->channel, w, e, s ); } @@ -501,7 +490,7 @@ } } - e = (jk_env_t *)env->createInstance( env, "endpoint", NULL ); + e = (jk_endpoint_t *)env->createInstance( env,ajp14->pool, "endpoint", NULL ); if( e==NULL ) return JK_FALSE; e->worker = ajp14; @@ -553,8 +542,6 @@ } if( ajp14->channelName == NULL ) { - - ajp14->channelName="channel.default"; } 1.11 +32 -4 jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c Index: jk_worker_status.c =================================================================== RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_worker_status.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- jk_worker_status.c 20 Mar 2002 23:40:52 -0000 1.10 +++ jk_worker_status.c 24 Mar 2002 19:24:26 -0000 1.11 @@ -134,11 +134,11 @@ /* Could be modified dynamically */ s->jkprintf(env, s, "<tr><th>LogLevel</th>" "<td id='logLevel'>%d</td></tr>\n", - wenv->log_level); + env->l->level); s->jkprintf(env, s, "</table>\n"); - s->jkprintf(env, s, "<H3>Properties</H3>\n"); + s->jkprintf(env, s, "<H3>Active Properties ( after substitution )</H3>\n"); s->jkprintf(env, s, "<table border>\n"); s->jkprintf(env, s, "<tr><th>Name</th><th>Value</td></tr>\n"); for( i=0; i< map->size( env, map ) ; i++ ) { @@ -146,7 +146,7 @@ char *value=(char *)map->valueAt( env, map,i ); /* Don't display worker properties or uris, those are displayed separately for each worker */ -/* if( strncmp( name, "worker.", 7 ) !=0 && */ +/* if( strncmp( name, "worker", 6 ) !=0 && */ /* name[0] != '/' ) { */ s->jkprintf(env, s, "<tr><td>%s</td><td>%s</td></tr>", name, value); @@ -154,8 +154,36 @@ } s->jkprintf(env, s, "</table>\n"); -} + s->jkprintf(env, s, "<H3>Configured Properties</H3>\n"); + s->jkprintf(env, s, "<table border>\n"); + s->jkprintf(env, s, "<tr><th>Object name</th><th>Property</th><th>Value</td></tr>\n"); + + for( i=0; i < env->_objects->size( env, env->_objects ); i++ ) { + char *name=env->_objects->nameAt( env, env->_objects, i ); + jk_bean_t *mbean=env->_objects->valueAt( env, env->_objects, i ); + int j; + + if( mbean==NULL || mbean->settings==NULL ) + continue; + + s->jkprintf(env, s, "<tr><td>%s</td>", mbean->name ); + + for( j=0; j < mbean->settings->size( env, mbean->settings ); j++ ) { + char *pname=mbean->settings->nameAt( env, mbean->settings, j); + /* Don't save redundant information */ + if( strcmp( pname, "name" ) != NULL ) { + s->jkprintf( env, s, "<td>%s</td><td>%s</td>\n", + pname, + mbean->settings->valueAt( env, mbean->settings, j)); + } + } + s->jkprintf( env,s , "</tr>\n" ); + } + s->jkprintf( env,s , "</table>\n" ); + +} + static void jk2_worker_status_displayMappings(jk_env_t *env, jk_ws_service_t *s, jk_workerEnv_t *wenv) {
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>