costin 02/05/09 17:01:37
Modified: jk/native2/common jk_channel_jni.c jk_vm_default.c
Log:
Less verbosity on the jni channel
Revision Changes Path
1.16 +22 -14 jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c
Index: jk_channel_jni.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_channel_jni.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- jk_channel_jni.c 8 May 2002 23:48:46 -0000 1.15
+++ jk_channel_jni.c 10 May 2002 00:01:37 -0000 1.16
@@ -323,7 +323,8 @@
jk_ch_jni_ep_private_t *epData=
(jk_ch_jni_ep_private_t *)endpoint->channelData;;
- env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.send() %p\n", epData );
+ if( _this->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.send() %p\n", epData );
if( epData == NULL ) {
jk2_channel_jni_open( env, _this, endpoint );
@@ -339,7 +340,8 @@
len=msg->len;
b=msg->buf;
- env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.send() (1) %p\n", epData );
+ if( _this->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.send() (1) %p\n",
epData );
jniEnv=NULL; /* epData->jniEnv; */
jbuf=epData->jarray;
@@ -359,8 +361,9 @@
}
}
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "channel_jni.send() getting byte array \n" );
+ if( _this->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "channel_jni.send() getting byte array \n" );
/* Copy the data in the ( recycled ) jbuf, then call the
* write method. XXX We could try 'pining' if the vm supports
@@ -369,7 +372,7 @@
nbuf = (*jniEnv)->GetByteArrayElements(jniEnv, jbuf, &iscommit);
if(nbuf==NULL ) {
- env->l->jkLog(env, env->l, JK_LOG_INFO,
+ env->l->jkLog(env, env->l, JK_LOG_ERROR,
"channelJni.send() Can't get java bytes");
return JK_ERR;
}
@@ -383,17 +386,19 @@
(*jniEnv)->ReleaseByteArrayElements(jniEnv, jbuf, nbuf, 0);
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "channel_jni.send() before send %p\n",
- (void *)(long)epData->jniJavaContext);
+ if( _this->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "channel_jni.send() before send %p\n",
+ (void *)(long)epData->jniJavaContext);
sent=(*jniEnv)->CallStaticIntMethod( jniEnv,
jniCh->jniBridge,
jniCh->writeMethod,
(jlong)(long)(void *)env,
epData->jniJavaContext );
- env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.send() result %d\n",
- sent);
+ if( _this->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,"channel_jni.send() result %d\n",
+ sent);
return JK_OK;
}
@@ -451,7 +456,8 @@
jint rc;
jk_workerEnv_t *we=worker->workerEnv;
- env->l->jkLog(env, env->l, JK_LOG_INFO, "service() attaching to vm\n");
+ if( worker->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO, "service() attaching to vm\n");
jniEnv=(JNIEnv *)endpoint->endpoint_private;
@@ -491,8 +497,9 @@
}
/* we->vm->detach( env, we->vm ); */
- env->l->jkLog(env, env->l, JK_LOG_INFO,
- "channelJni.afterRequest() ok\n");
+ if( worker->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,
+ "channelJni.afterRequest() ok\n");
return JK_OK;
}
@@ -504,7 +511,8 @@
jk_channel_t *jniCh=(jk_channel_t *)jniChB->object;
int code;
- env->l->jkLog(env, env->l, JK_LOG_INFO,"channelJni.java2cInvoke() ok\n");
+ if( jniCh->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO,"channelJni.java2cInvoke() ok\n");
code = (int)msg->getByte(env, msg);
return ep->worker->workerEnv->dispatch( env, ep->worker->workerEnv,
1.12 +2 -1 jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c
Index: jk_vm_default.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native2/common/jk_vm_default.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- jk_vm_default.c 7 May 2002 19:42:40 -0000 1.11
+++ jk_vm_default.c 10 May 2002 00:01:37 -0000 1.12
@@ -294,7 +294,8 @@
"vm.attach() error %d\n", err);
return NULL;
}
- env->l->jkLog(env, env->l, JK_LOG_INFO, "vm.attach() ok\n");
+ if( jkvm->mbean->debug > 0 )
+ env->l->jkLog(env, env->l, JK_LOG_INFO, "vm.attach() ok\n");
return rc;
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
