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

[costin]

costin      02/05/30 11:20:49

  Modified:    jk/native2/common jk_config.c
  Log:
  Pass the disabled and debug attributes to the component.
  
  Revision  Changes    Path
  1.24      +24 -7     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.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- jk_config.c       29 May 2002 17:51:23 -0000      1.23
  +++ jk_config.c       30 May 2002 18:20:49 -0000      1.24
  @@ -58,7 +58,7 @@
   /***************************************************************************
    * Description: General purpose config object                                 *
    * Author:      Gal Shachor <[EMAIL PROTECTED]>                           *
  - * Version:     $Revision: 1.23 $                                           *
  + * Version:     $Revision: 1.24 $                                           *
    ***************************************************************************/
   
   #include "jk_global.h"
  @@ -262,9 +262,11 @@
       } else {
           cfg->map->put( env, cfg->map, pname, val, NULL );
       }
  -
  -    /*     env->l->jkLog( env, env->l, JK_LOG_INFO, "config: set %s / %s / 
%s=%s\n", */
  -    /*                    mbean->name, name, pname, val); */
  +    
  +    if( cfg->mbean->debug > 0 )
  +        env->l->jkLog( env, env->l, JK_LOG_INFO, "config: set %s / %s / %p / %s = 
%s\n",
  +                       mbean->name, name, mbean, pname, val);
  +    
       if( strcmp( name, "name" ) == 0 ) {
           return JK_OK;
       }
  @@ -274,10 +276,16 @@
       }
       if( strcmp( name, "debug" ) == 0 ) {
           mbean->debug=atoi( val );
  +        if(mbean->setAttribute) {
  +            mbean->setAttribute( env, mbean, name, val );
  +        }
           return JK_OK;
       }
       if( strcmp( name, "disabled" ) == 0 ) {
           mbean->disabled=atoi( val );
  +        if(mbean->setAttribute) {
  +            mbean->setAttribute( env, mbean, name, val );
  +        }
           return JK_OK;
       }
       if( strcmp( name, "info" ) == 0 ) {
  @@ -460,6 +468,10 @@
       int ver;
       char *verString;
   
  +    if( cfg->mbean->debug > 5 ) 
  +    env->l->jkLog(env, env->l, JK_LOG_INFO, 
  +                  "config.setConfig():  process %s\n", name );
  +    
       bean=env->getBean( env, name );
       if( bean==NULL ) {
           if( cfg->mbean->debug > 0 ) {
  @@ -530,8 +542,13 @@
           return JK_ERR;
       }
       
  -    if( !firstTime && statbuf.st_mtime < cfg->mtime )
  +    if( !firstTime && statbuf.st_mtime < cfg->mtime ) {
  +        if( cfg->mbean->debug > 0 )
  +            env->l->jkLog(env, env->l, JK_LOG_ERROR,
  +                          "config.update(): No reload needed %s %ld %ld\n", 
cfg->file,
  +                          cfg->mtime, statbuf.st_mtime );
           return JK_OK;
  +    }
        
       JK_ENTER_CS(&cfg->cs, csOk);
       
  @@ -589,9 +606,9 @@
   
   
   static int jk2_config_update(jk_env_t *env,
  -                                       jk_config_t *cfg, int *didReload)
  +                             jk_config_t *cfg, int *didReload)
   {
  -     return jk2_config_readFile( env, cfg, didReload, JK_FALSE );
  +    return jk2_config_readFile( env, cfg, didReload, JK_FALSE );
   }
   
   /** Set a property for this config object
  
  
  

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