From 2ea3b7b4f082a74e2b781b35b964bfbd937620d7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Lesaint?= Date: Fri, 3 Jun 2016 11:01:07 +0200 Subject: [PATCH] remove pico component instantiation trace logs --- .../container/ComputeEngineContainerImpl.java | 34 +------------------ 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java index ffcb2f8f836..a41d9254643 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/computation/container/ComputeEngineContainerImpl.java @@ -19,33 +19,23 @@ */ package org.sonar.server.computation.container; -import java.lang.reflect.Constructor; -import java.lang.reflect.Member; import java.util.List; import org.picocontainer.ComponentAdapter; import org.picocontainer.ComponentMonitor; import org.picocontainer.DefaultPicoContainer; import org.picocontainer.MutablePicoContainer; -import org.picocontainer.PicoContainer; import org.picocontainer.behaviors.OptInCaching; import org.picocontainer.lifecycle.ReflectionLifecycleStrategy; -import org.picocontainer.monitors.ComponentMonitorHelper; import org.picocontainer.monitors.NullComponentMonitor; import org.sonar.api.config.PropertyDefinitions; -import org.sonar.api.utils.log.Logger; import org.sonar.api.utils.log.Loggers; import org.sonar.core.platform.ComponentContainer; import org.sonar.core.platform.ContainerPopulator; import org.sonar.core.platform.Module; import static java.util.Objects.requireNonNull; -import static org.picocontainer.monitors.ComponentMonitorHelper.ctorToString; -import static org.picocontainer.monitors.ComponentMonitorHelper.format; -import static org.picocontainer.monitors.ComponentMonitorHelper.methodToString; -import static org.picocontainer.monitors.ComponentMonitorHelper.parmsToString; public class ComputeEngineContainerImpl extends ComponentContainer implements ComputeEngineContainer { - private static final Logger LOG = Loggers.get(ComputeEngineContainerImpl.class); public ComputeEngineContainerImpl(ComponentContainer parent, ContainerPopulator populator) { super(createContainer(requireNonNull(parent)), parent.getComponentByType(PropertyDefinitions.class)); @@ -71,7 +61,7 @@ public class ComputeEngineContainerImpl extends ComponentContainer implements Co * and lazily starts its components. */ private static MutablePicoContainer createContainer(ComponentContainer parent) { - ComponentMonitor componentMonitor = instanceComponentMonitor(); + ComponentMonitor componentMonitor = new NullComponentMonitor(); ReflectionLifecycleStrategy lifecycleStrategy = new ReflectionLifecycleStrategy(componentMonitor, "start", "stop", "close") { @Override public boolean isLazy(ComponentAdapter adapter) { @@ -82,28 +72,6 @@ public class ComputeEngineContainerImpl extends ComponentContainer implements Co return new DefaultPicoContainer(new OptInCaching(), lifecycleStrategy, parent.getPicoContainer(), componentMonitor); } - private static ComponentMonitor instanceComponentMonitor() { - if (!LOG.isTraceEnabled()) { - return new NullComponentMonitor(); - } - return new ComputeEngineComponentMonitor(); - } - - private static class ComputeEngineComponentMonitor extends NullComponentMonitor { - - @Override - public void instantiated(PicoContainer container, ComponentAdapter componentAdapter, - Constructor constructor, Object instantiated, Object[] parameters, long duration) { - LOG.trace(format(ComponentMonitorHelper.INSTANTIATED, ctorToString(constructor), duration, instantiated.getClass().getName(), parmsToString(parameters))); - } - - @Override - public void invoked(PicoContainer container, ComponentAdapter componentAdapter, Member member, Object instance, long duration, Object[] args, Object retVal) { - LOG.trace(format(ComponentMonitorHelper.INVOKED, methodToString(member), instance, duration)); - } - - } - @Override public void cleanup() { try { -- 2.39.5