You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2017/10/27 17:59:09 UTC

[3/5] tomee git commit: using default interceptor

using default interceptor


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/e7f96f22
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/e7f96f22
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/e7f96f22

Branch: refs/heads/tomee-1.7.x
Commit: e7f96f22ffefe13e6b26e2585bd4d3c6c4c4605a
Parents: 8f9587b
Author: Thiago Veronezi <th...@veronezi.org>
Authored: Thu Oct 26 13:36:58 2017 -0400
Committer: Thiago Veronezi <th...@veronezi.org>
Committed: Thu Oct 26 13:36:58 2017 -0400

----------------------------------------------------------------------
 .../src/main/java/org/apache/openejb/BeanContext.java   |  2 --
 .../org/apache/openejb/monitoring/StatsInterceptor.java | 12 ++++++++++++
 .../src/main/java/org/apache/openejb/util/Pool.java     |  3 ---
 .../apache/openejb/util/resources/Messages.properties   |  4 ++--
 4 files changed, 14 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/e7f96f22/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
index 2031a71..c33502b 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/BeanContext.java
@@ -1594,8 +1594,6 @@ public class BeanContext extends DeploymentContext {
             } finally {
                 EjbTransactionUtil.afterInvoke(transactionPolicy, callContext);
             }
-            Logger.getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources")
-                    .info("instance.created", beanInstance.getClass().getName());
 
             // handle cdi decorators
             if (cdiEjbBean != null) {

http://git-wip-us.apache.org/repos/asf/tomee/blob/e7f96f22/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
index 6fb00f6..393b315 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/monitoring/StatsInterceptor.java
@@ -21,6 +21,8 @@ import org.apache.openejb.api.Monitor;
 import org.apache.openejb.core.interceptor.InterceptorData;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.math.stat.descriptive.SynchronizedDescriptiveStatistics;
+import org.apache.openejb.util.LogCategory;
+import org.apache.openejb.util.Logger;
 import org.apache.xbean.finder.ClassFinder;
 
 import javax.annotation.PostConstruct;
@@ -106,7 +108,12 @@ public class StatsInterceptor {
 
     @PostConstruct
     public void PostConstruct(final InvocationContext invocationContext) throws Exception {
+        long start = System.nanoTime();
         record(invocationContext, PostConstruct());
+        long end = System.nanoTime();
+        org.apache.openejb.util.Logger
+                .getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources")
+                .info("instance.created", invocationContext.getTarget().getClass().getName(), end - start);
     }
 
     public Method PreDestroy() throws NoSuchMethodException {
@@ -115,7 +122,12 @@ public class StatsInterceptor {
 
     @PreDestroy
     public void PreDestroy(final InvocationContext invocationContext) throws Exception {
+        long start = System.nanoTime();
         record(invocationContext, PreDestroy());
+        long end = System.nanoTime();
+        org.apache.openejb.util.Logger
+                .getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources")
+                .info("instance.discarded", invocationContext.getTarget().getClass().getName(), end - start);
     }
 
     public Method PostActivate() throws NoSuchMethodException {

http://git-wip-us.apache.org/repos/asf/tomee/blob/e7f96f22/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java b/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
index ddeab62..08c87b7 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/util/Pool.java
@@ -922,9 +922,6 @@ public class Pool<T> {
             }
             try {
                 supplier.discard(expired, event);
-                org.apache.openejb.util.Logger
-                        .getInstance(LogCategory.OPENEJB, "org.apache.openejb.util.resources")
-                        .info("instance.discarded", expired.getClass().getName());
             } finally {
                 out.countDown();
             }

http://git-wip-us.apache.org/repos/asf/tomee/blob/e7f96f22/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties b/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
index 08b7892..3284ce2 100644
--- a/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
+++ b/container/openejb-core/src/main/resources/org/apache/openejb/util/resources/Messages.properties
@@ -262,8 +262,8 @@ deploy.c.061=Deploy option -c.  Could not copy jar {0} to {1}. Jar already exist
 
 entityEjbHomeHandler.containerInvocationFailure=Failure at container invocation: {0}
 
-instance.created=Instance created: {0}
-instance.discarded=Instance discarded: {0}
+instance.created=Instance created: {0} {1}ns
+instance.discarded=Instance discarded: {0} {1}ns
 
 # ConfigurationFactory
 # DeploymentLoader.logger.info("validationDisabled");