cvs commit: jakarta-tomcat-connectors/jk/native2/common jk_uriEnv.c

[costin]

costin      02/05/03 10:43:59

  Modified:    jk/native2/common jk_uriEnv.c
  Log:
  Rename 'worker' to 'group' in the config.
  
  This will hopefully reduce the confusion.
  
  Revision  Changes    Path
  1.15      +9 -6      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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- jk_uriEnv.c       1 May 2002 17:23:14 -0000       1.14
  +++ jk_uriEnv.c       3 May 2002 17:43:59 -0000       1.15
  @@ -126,7 +126,7 @@
           return  (uriEnv->virtual==NULL) ? "*" : uriEnv->virtual;
       } else if( strcmp( name, "uri" ) ) {
           return uriEnv->uri;
  -    } else if( strcmp( name, "worker" ) ) {
  +    } else if( strcmp( name, "group" ) ) {
           return uriEnv->workerName;
       }
       return NULL;
  @@ -223,10 +223,13 @@
       if( uriEnv->workerName != NULL && uriEnv->worker==NULL ) {
           uriEnv->worker= env->getByName( env, wname );
           if( uriEnv->worker==NULL ) {
  -            env->l->jkLog(env, env->l, JK_LOG_ERROR,
  -                          "uriEnv.init() map to invalid worker %s %s\n",
  -                          uriEnv->uri, uriEnv->workerName);
  -            /* XXX that's allways a 'lb' worker, create it */
  +            uriEnv->worker= env->getByName2( env, "worker.lb", wname );
  +            if( uriEnv->worker==NULL ) {
  +                env->l->jkLog(env, env->l, JK_LOG_ERROR,
  +                              "uriEnv.init() map to invalid worker %s %s\n",
  +                              uriEnv->uri, uriEnv->workerName);
  +                /* XXX that's allways a 'lb' worker, create it */
  +            }
           }
       } 
       
  @@ -358,7 +361,7 @@
       return JK_OK;
   }
   
  -static char *myAttInfo[]={ "host", "uri", "worker", NULL };
  +static char *myAttInfo[]={ "host", "uri", "group", NULL };
       
   int JK_METHOD jk2_uriEnv_factory(jk_env_t *env, jk_pool_t *pool,
                                    jk_bean_t *result,
  
  
  

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