costin 02/05/14 13:42:49 Modified: jk/native2/common jk_channel_socket.c jk_config.c Log: Various small fixes, reduce logging verbosity ( by using the component debug level ) Revision Changes Path 1.25 +4 -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.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- jk_channel_socket.c 14 May 2002 17:27:21 -0000 1.24 +++ jk_channel_socket.c 14 May 2002 20:42:49 -0000 1.25 @@ -308,9 +308,10 @@ int set = 1; setsockopt(sock, IPPROTO_TCP, TCP_NODELAY,(char *)&set,sizeof(set)); } - - env->l->jkLog(env, env->l, JK_LOG_INFO, - "channelSocket.connect(), sock = %d\n", sock); + + if( ch->mbean->debug > 0 ) + env->l->jkLog(env, env->l, JK_LOG_INFO, + "channelSocket.connect(), sock = %d\n", sock); { jk_channel_socket_data_t *sd=endpoint->channelData; 1.17 +16 -11 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.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- jk_config.c 14 May 2002 17:12:45 -0000 1.16 +++ jk_config.c 14 May 2002 20:42:49 -0000 1.17 @@ -58,7 +58,7 @@ /*************************************************************************** * Description: General purpose config object * * Author: Gal Shachor <[EMAIL PROTECTED]> * - * Version: $Revision: 1.16 $ * + * Version: $Revision: 1.17 $ * ***************************************************************************/ #include "jk_global.h" @@ -624,6 +624,7 @@ int *didReload, int firstTime) { int rc; + int csOk; struct stat statbuf; time_t mtime; jk_map_t *cfgData; @@ -631,8 +632,11 @@ if( didReload!=NULL ) *didReload=JK_FALSE; - if( cfg->file==NULL ) + if( cfg->file==NULL ) { + env->l->jkLog(env, env->l, JK_LOG_ERROR, + "config.update(): No config file" ); return JK_ERR; + } rc=stat(cfg->file, &statbuf); if (rc == -1) { @@ -641,12 +645,12 @@ return JK_ERR; } - if( statbuf.st_mtime < cfg->mtime ) + if( !firstTime && statbuf.st_mtime < cfg->mtime ) return JK_OK; - JK_ENTER_CS(&cfg->cs, rc); + JK_ENTER_CS(&cfg->cs, csOk); - if(rc !=JK_TRUE) { + if(csOk !=JK_TRUE) { env->l->jkLog(env, env->l, JK_LOG_ERROR, "cfg.update() Can't enter critical section\n"); return JK_ERR; @@ -658,12 +662,12 @@ if (rc == -1) { env->l->jkLog(env, env->l, JK_LOG_ERROR, "config.update(): Can't find config file %s", cfg->file ); - JK_LEAVE_CS(&cfg->cs, rc); + JK_LEAVE_CS(&cfg->cs, csOk); return JK_ERR; } - if( statbuf.st_mtime <= cfg->mtime ) { - JK_LEAVE_CS(&cfg->cs, rc); + if( ! firstTime && statbuf.st_mtime <= cfg->mtime ) { + JK_LEAVE_CS(&cfg->cs, csOk); return JK_OK; } @@ -683,7 +687,7 @@ env->l->jkLog(env, env->l, JK_LOG_ERROR, "config.setConfig(): Error reading properties %s\n", cfg->file ); - JK_LEAVE_CS(&cfg->cs, rc); + JK_LEAVE_CS(&cfg->cs, csOk); return JK_ERR; } @@ -691,9 +695,10 @@ if( didReload!=NULL ) *didReload=JK_TRUE; + cfg->mtime= statbuf.st_mtime; - JK_LEAVE_CS(&cfg->cs, rc); + JK_LEAVE_CS(&cfg->cs, csOk); return rc; } @@ -707,7 +712,7 @@ /** Set a property for this config object */ static int JK_METHOD jk2_config_setAttribute( struct jk_env *env, struct jk_bean *mbean, - char *name, void *valueP) + char *name, void *valueP) { jk_config_t *cfg=mbean->object; char *value=valueP;
-- To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]> For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>