diff options
6 files changed, 7 insertions, 33 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index ab764e97fa0..2c25f38437a 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -42,7 +42,7 @@ import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Transport; import com.yahoo.jrt.slobrok.api.Register; import com.yahoo.jrt.slobrok.api.SlobrokList; -import com.yahoo.log.impl.InitializeLog; +import com.yahoo.log.LogSetup; import com.yahoo.messagebus.network.rpc.SlobrokConfigSubscriber; import com.yahoo.net.HostName; import com.yahoo.vespa.config.ConfigKey; @@ -109,7 +109,7 @@ public final class ConfiguredApplication implements Application { private volatile boolean shutdownReconfiguration = false; static { - InitializeLog.init(); + LogSetup.initVespaLogging("Container"); log.log(Level.INFO, "Starting jdisc" + (Vtag.currentVersion.isEmpty() ? "" : " at version " + Vtag.currentVersion)); installBouncyCastleSecurityProvider(); } @@ -460,6 +460,7 @@ public final class ConfiguredApplication implements Application { slobrokConfigSubscriber.ifPresent(SlobrokConfigSubscriber::shutdown); Container.get().shutdown(); unregisterInSlobrok(); + LogSetup.cleanup(); shutdownDeadline.cancel(); log.info("Destroy: Finished"); } 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 601a96da24d..952e8dd5f00 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 @@ -16,8 +16,6 @@ import com.yahoo.jdisc.application.OsgiHeader; import com.yahoo.jdisc.service.ContainerNotReadyException; import com.yahoo.jdisc.service.CurrentContainer; import com.yahoo.jdisc.statistics.ContainerWatchdogMetrics; -import com.yahoo.log.impl.InitializeLog; -import com.yahoo.log.LogSetup; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; @@ -48,7 +46,6 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C private ApplicationInUseTracker applicationInUseTracker; public ApplicationLoader(OsgiFramework osgiFramework, Iterable<? extends Module> guiceModules) { - InitializeLog.init(); this.osgiFramework = osgiFramework; this.guiceModules.install(new ApplicationEnvironmentModule(this)); this.guiceModules.installAll(guiceModules); @@ -201,7 +198,6 @@ public class ApplicationLoader implements BootstrapLoader, ContainerActivator, C try { watchdog.close(); osgiFramework.stop(); - LogSetup.cleanup(); } catch (BundleException | InterruptedException e) { e.printStackTrace(); } diff --git a/vespalog/src/main/java/com/yahoo/log/LogSetup.java b/vespalog/src/main/java/com/yahoo/log/LogSetup.java index d285382849e..67fb7f71a2d 100644 --- a/vespalog/src/main/java/com/yahoo/log/LogSetup.java +++ b/vespalog/src/main/java/com/yahoo/log/LogSetup.java @@ -1,6 +1,8 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.log; +import com.yahoo.log.impl.LogUtils; + import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -23,7 +25,7 @@ import java.util.logging.Logger; @SuppressWarnings("removal") public class LogSetup { - private static final Timer taskRunner = new Timer(true); + private static Timer taskRunner = new Timer(true); /** * A global task thread diff --git a/vespalog/src/main/java/com/yahoo/log/impl/InitializeLog.java b/vespalog/src/main/java/com/yahoo/log/impl/InitializeLog.java deleted file mode 100644 index 9b309916469..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/impl/InitializeLog.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.yahoo.log.impl; - -import com.yahoo.log.LogSetup; - -/** - * Sets up Vespa logging. Call a setup method to set up this. - * - * @author baldersheim - */ -public class InitializeLog { - static { - LogSetup.initVespaLogging("unused-default"); - } - - /** - * Do not delete this method even if it's empty. - * Calling this methods forces this class to be loaded, - * which runs the static block. - */ - public static void init() { } -} diff --git a/vespalog/src/main/java/com/yahoo/log/impl/LogUtils.java b/vespalog/src/main/java/com/yahoo/log/impl/LogUtils.java index e8d7b17abff..8c182625c85 100644 --- a/vespalog/src/main/java/com/yahoo/log/impl/LogUtils.java +++ b/vespalog/src/main/java/com/yahoo/log/impl/LogUtils.java @@ -8,6 +8,7 @@ import static com.yahoo.vespa.defaults.Defaults.getDefaults; * @author Bjorn Borud * @author arnej27959 * @author bjorncs + * TODO remove "public" keyword, should be package private */ public class LogUtils { public static boolean empty(String s) { diff --git a/vespalog/src/main/java/com/yahoo/log/impl/package-info.java b/vespalog/src/main/java/com/yahoo/log/impl/package-info.java deleted file mode 100644 index ac6fe22b9cf..00000000000 --- a/vespalog/src/main/java/com/yahoo/log/impl/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -@ExportPackage -package com.yahoo.log.impl; - -import com.yahoo.osgi.annotation.ExportPackage; |