diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-09 15:54:38 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-09 15:54:38 +0200 |
commit | f2f303d155655e6652ec7b9de680ca575e67d078 (patch) | |
tree | 253a2f74cc37f0bc236fc258dde22683e0a9c9fe /vespalog/src | |
parent | 183ef58a4c6972a8f222778e4c0ccb4615e1a9ef (diff) |
Revert "Setup vespalog in jdisc core [run-systemtest]"
Diffstat (limited to 'vespalog/src')
4 files changed, 4 insertions, 27 deletions
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; |