Initialize logging earlier in container startup sequence

4 files changed, 33 insertions, 4 deletions

diff --git a/vespalog/abi-spec.json b/vespalog/abi-spec.json
index 996cc0259a0..7c4d72f1728 100644
--- a/vespalog/abi-spec.json
+++ b/vespalog/abi-spec.json
@@ -15,6 +15,18 @@
     ],
     "fields": []
   },
+  "com.yahoo.log.InitializeLog": {
+    "superClass": "java.lang.Object",
+    "interfaces": [],
+    "attributes": [
+      "public"
+    ],
+    "methods": [
+      "public void <init>()",
+      "public static void init()"
+    ],
+    "fields": []
+  },
   "com.yahoo.log.InvalidLogFormatException": {
     "superClass": "java.lang.Exception",
     "interfaces": [],
diff --git a/vespalog/src/main/java/com/yahoo/log/InitializeLog.java b/vespalog/src/main/java/com/yahoo/log/InitializeLog.java
new file mode 100644
index 00000000000..0bb2916b438
--- /dev/null
+++ b/vespalog/src/main/java/com/yahoo/log/InitializeLog.java
@@ -0,0 +1,20 @@
+package com.yahoo.log;
+
+/**
+ * Sets up Vespa logging. Call a setup method to set up this.
+ *
+ * @author baldersheim
+ */
+public class InitializeLog {
+    static {
+        LogSetup.initVespaLogging("Container");
+    }
+
+    /**
+     * Do not delete this method even if it's empty.
+     * Calling this methods forces this class to be loaded,
+     * which runs the static block.
+     */
+    @SuppressWarnings("UnusedDeclaration")
+    public static void init() { }
+}
diff --git a/vespalog/src/main/java/com/yahoo/log/LogSetup.java b/vespalog/src/main/java/com/yahoo/log/LogSetup.java
index 67fb7f71a2d..d285382849e 100644
--- a/vespalog/src/main/java/com/yahoo/log/LogSetup.java
+++ b/vespalog/src/main/java/com/yahoo/log/LogSetup.java
@@ -1,8 +1,6 @@
 // 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;
@@ -25,7 +23,7 @@ import java.util.logging.Logger;
 @SuppressWarnings("removal")
 public class LogSetup {
 
-    private static Timer taskRunner = new Timer(true);
+    private static final Timer taskRunner = new Timer(true);
 
     /**
      * A global task thread
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 8c182625c85..e8d7b17abff 100644
--- a/vespalog/src/main/java/com/yahoo/log/impl/LogUtils.java
+++ b/vespalog/src/main/java/com/yahoo/log/impl/LogUtils.java
@@ -8,7 +8,6 @@ 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) {