diff options
author | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-05-30 17:12:40 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@yahoo-inc.com> | 2017-05-30 17:12:40 +0200 |
commit | 319a78e6c340889beb7185b88d9195e99238d410 (patch) | |
tree | 1acea130bb4f42c8e7e987aa7393758b088f89be /jdisc_core | |
parent | d0f53d3a20495b595c3b2f6684be0fae5f9e1f20 (diff) |
Revert "Use ActiveContainerStatistics"
This reverts commit 606acc8e051d983698099f9ec1bcbfcde10a2690.
Diffstat (limited to 'jdisc_core')
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationEnvironmentModule.java | 1 | ||||
-rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java | 24 |
2 files changed, 5 insertions, 20 deletions
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationEnvironmentModule.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationEnvironmentModule.java index d080e97ec3b..c6d6efd0ee9 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationEnvironmentModule.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationEnvironmentModule.java @@ -28,7 +28,6 @@ class ApplicationEnvironmentModule extends AbstractModule { bind(CurrentContainer.class).toInstance(loader); bind(OsgiFramework.class).toInstance(loader.osgiFramework()); bind(ThreadFactory.class).to(ContainerThread.Factory.class); - bind(ActiveContainerStatistics.class).toInstance(loader.getActiveContainerStatistics()); } @Provides diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java index abc133f2d4e..2dd7f7eb879 100644 --- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java +++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/ApplicationLoader.java @@ -5,14 +5,7 @@ import com.google.inject.AbstractModule; import com.google.inject.Injector; import com.google.inject.Module; import com.yahoo.jdisc.AbstractResource; -import com.yahoo.jdisc.application.Application; -import com.yahoo.jdisc.application.ApplicationNotReadyException; -import com.yahoo.jdisc.application.ContainerActivator; -import com.yahoo.jdisc.application.ContainerBuilder; -import com.yahoo.jdisc.application.DeactivatedContainer; -import com.yahoo.jdisc.application.GuiceRepository; -import com.yahoo.jdisc.application.OsgiFramework; -import com.yahoo.jdisc.application.OsgiHeader; +import com.yahoo.jdisc.application.*; import com.yahoo.jdisc.service.ContainerNotReadyException; import com.yahoo.jdisc.service.CurrentContainer; import org.osgi.framework.Bundle; @@ -35,13 +28,11 @@ import java.util.logging.Logger; public class ApplicationLoader implements BootstrapLoader, ContainerActivator, CurrentContainer { private static final Logger log = Logger.getLogger(ApplicationLoader.class.getName()); - private final OsgiFramework osgiFramework; private final GuiceRepository guiceModules = new GuiceRepository(); private final AtomicReference<ActiveContainer> containerRef = new AtomicReference<>(); private final Object appLock = new Object(); private final List<Bundle> appBundles = new ArrayList<>(); - private final ActiveContainerStatistics statistics = new ActiveContainerStatistics(); private Application application; private ApplicationInUseTracker applicationInUseTracker; @@ -71,11 +62,9 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C } prev = containerRef.getAndSet(next); - statistics.onActivated(next); if (prev == null) { return null; } - statistics.onDeactivated(prev); } prev.release(); DeactivatedContainer deactivatedContainer = prev.shutdown(); @@ -93,9 +82,11 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C Thread.sleep(TimeUnit.MILLISECONDS.convert(currentWaitTimeSeconds, TimeUnit.SECONDS)) ); - statistics.printSummaryToLog(); final ActiveContainer prevContainer = prevContainerReference.get(); - if (prevContainer == null || prevContainer.retainCount() == 0) { + if (prevContainer == null) { + return; + } + if (prevContainer.retainCount() == 0) { return; } log.warning("Previous container not terminated in the last " + totalTimeWaited + " seconds." @@ -240,10 +231,6 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C } } - public ActiveContainerStatistics getActiveContainerStatistics() { - return statistics; - } - public OsgiFramework osgiFramework() { return osgiFramework; } @@ -271,5 +258,4 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C } } } - } |