[all] more log levels, new log format.

EskoDijk · Sep 1, 2024 · 96d79b5 · 96d79b5
1 parent 422334d
commit 96d79b5
Show file tree

Hide file tree

Showing 6 changed files with 117 additions and 15 deletions.
diff --git a/src/main/java/com/google/openthread/LoggerInitializer.java b/src/main/java/com/google/openthread/LoggerInitializer.java
@@ -38,10 +38,41 @@ public class LoggerInitializer {
 
   private static final String OPENTHREAD = "com.google.openthread";
   private static final String CALIFORNIUM = "org.eclipse.californium";
+  private static final String XNIO = "org.xnio";
+  private static final String JBOSS = "org.jboss";
+  private static final String UNDERTOW = "io.undertow";
 
-  public static void Init(boolean verbose) {
-    final Level level = verbose ? Level.DEBUG : Level.INFO;
-    final Level levelLibrary = verbose ? Level.INFO : Level.WARN;
+  public static void Init(int verbosity) {
+    Level level, levelLibrary;
+
+    switch (verbosity) {
+      case 0:
+        level = Level.WARN;
+        levelLibrary = Level.ERROR;
+        break;
+      case 1:
+        level = Level.INFO;
+        levelLibrary = Level.WARN;
+        break;
+      case 2:
+        level = Level.DEBUG;
+        levelLibrary = Level.INFO;
+        break;
+      case 3:
+        level = Level.DEBUG;
+        levelLibrary = Level.DEBUG;
+        break;
+      case 4:
+        level = Level.TRACE;
+        levelLibrary = Level.DEBUG;
+        break;
+      case 5:
+        level = Level.TRACE;
+        levelLibrary = Level.TRACE;
+        break;
+      default:
+        throw new IllegalArgumentException("verbosity parameter must be <= 5");
+    }
 
     LoggerContext loggerContext = (LoggerContext) LoggerFactory.getILoggerFactory();
     List<Logger> loggerList = loggerContext.getLoggerList();
@@ -51,11 +82,19 @@ public static void Init(boolean verbose) {
           logger.setLevel(level);
           break;
         case CALIFORNIUM:
+        case XNIO:
+        case JBOSS:
+        case UNDERTOW:
           logger.setLevel(levelLibrary);
           break;
       }
     }
 
+    ((Logger)LoggerFactory.getLogger(OPENTHREAD)).setLevel(level);
+
     ((Logger)LoggerFactory.getLogger(CALIFORNIUM)).setLevel(levelLibrary);
+    ((Logger)LoggerFactory.getLogger(XNIO)).setLevel(levelLibrary);
+    ((Logger)LoggerFactory.getLogger(JBOSS)).setLevel(levelLibrary);
+    ((Logger)LoggerFactory.getLogger(UNDERTOW)).setLevel(levelLibrary);
   }
 }
diff --git a/src/main/java/com/google/openthread/main/OtRegistrarConfig.java b/src/main/java/com/google/openthread/main/OtRegistrarConfig.java
@@ -38,7 +38,7 @@ public class OtRegistrarConfig {
   public String keyStoreFile;
   public String masaUri;
   public String registrarUri;
-  public boolean logVerbose;
+  public int logVerbosity;
 
   static OtRegistrarConfig DefaultPledge() {
     OtRegistrarConfig config = new OtRegistrarConfig();
@@ -48,7 +48,7 @@ static OtRegistrarConfig DefaultPledge() {
     config.keyStoreFile = "./credentials/default_pledge.p12";
     config.masaUri = null;
     config.registrarUri = "coaps://localhost:5684";
-    config.logVerbose = false;
+    config.logVerbosity = 0;
     return config;
   }
 
@@ -60,7 +60,7 @@ static OtRegistrarConfig DefaultRegistrar() {
     config.keyStoreFile = "./credentials/default_registrar.p12";
     config.masaUri = null;
     config.registrarUri = null;
-    config.logVerbose = false;
+    config.logVerbosity = 0;
     return config;
   }
 
@@ -72,7 +72,7 @@ static OtRegistrarConfig DefaultMasa() {
     config.keyStoreFile = "./credentials/default_masa.p12";
     config.masaUri = null;
     config.registrarUri = null;
-    config.logVerbose = false;
+    config.logVerbosity = 0;
     return config;
   }
 
@@ -94,7 +94,28 @@ public String ToString() {
     if (this.registrarUri != null) {
       s += "Registrar URI : " + this.registrarUri + "\n";
     }
-    s += "Log verbose   : " + (this.logVerbose ? "yes" : "no") + "\n";
+    s += "Log verbosity : " + this.logVerbosity + "\n";
     return s;
   }
-}
+
+  public String ToStringSingleLine() {
+    String s;
+    s = "role=" + role.toString();
+    if (this.serverPort > 0) {
+      s += " port=" + this.serverPort;
+    }
+    if (this.domainName != null) {
+      s += " domain=" + this.domainName;
+    }
+    if (this.keyStoreFile != null) {
+      s += " keyfile=" + this.keyStoreFile;
+    }
+    if (this.masaUri != null) {
+      s += " masaUri=" + this.masaUri;
+    }
+    if (this.registrarUri != null) {
+      s += " registrarUri=" + this.registrarUri;
+    }
+    s += " verbosity=" + this.logVerbosity;
+    return s;
+  }}
diff --git a/src/main/java/com/google/openthread/main/OtRegistrarMain.java b/src/main/java/com/google/openthread/main/OtRegistrarMain.java
@@ -50,7 +50,7 @@ public final class OtRegistrarMain {
 
   public static void main(String[] args) {
 
-    final String HELP_FORMAT = "[-registrar | -masa | -pledge] [-h] [-v] [-d <domain-name>] [-f <keystore-file>] [-p <udp-port>]";
+    final String HELP_FORMAT = "[-registrar | -masa | -pledge] [-h] [-d <domain-name>] [-f <keystore-file>] [-p <udp-port>] [-v] [-vv] [-vvv] [-vvvv]";
 
     HelpFormatter helper = new HelpFormatter();
     Options options = new Options();
@@ -97,7 +97,22 @@ public static void main(String[] args) {
     Option verboseOpt =
         Option.builder("v")
             .longOpt("verbose")
-            .desc("verbose mode with many logs")
+            .desc("verbose mode for logs")
+            .build();
+
+    Option verboseVvOpt =
+        Option.builder("vv")
+            .desc("more verbose mode for logs")
+            .build();
+
+    Option verboseVvvOpt =
+        Option.builder("vvv")
+            .desc("even more verbose mode for logs")
+            .build();
+
+    Option verboseVvvvOpt =
+        Option.builder("vvvv")
+            .desc("most verbose mode for logs")
             .build();
 
     Option masaUriOpt =
@@ -130,6 +145,9 @@ public static void main(String[] args) {
         .addOption(fileOpt)
         .addOption(portOpt)
         .addOption(verboseOpt)
+        .addOption(verboseVvOpt)
+        .addOption(verboseVvvOpt)
+        .addOption(verboseVvvvOpt)
         .addOption(masaUriOpt)
         .addOption(registrarUriOpt)
         .addOption(helpOpt);
@@ -156,10 +174,20 @@ public static void main(String[] args) {
         return;
       }
 
+      config.logVerbosity = 0;
       if (cmd.hasOption('v')) {
-        config.logVerbose = true;
+        config.logVerbosity = 1;
+      }
+      if (cmd.hasOption("vv")) {
+        config.logVerbosity = 2;
+      }
+      if (cmd.hasOption("vvv")) {
+        config.logVerbosity = 3;
+      }
+      if (cmd.hasOption("vvvv")) {
+        config.logVerbosity = 4;
       }
-      LoggerInitializer.Init(config.logVerbose);
+      LoggerInitializer.Init(config.logVerbosity);
 
       if (cmd.hasOption('f')) {
         config.keyStoreFile = cmd.getOptionValue('f');
@@ -180,7 +208,8 @@ public static void main(String[] args) {
       return;
     }
 
-    logger.info("Configuration:\n{}", config.ToString());
+    logger.info("Configuration: {}", config.ToStringSingleLine());
+    System.out.println("Configuration :\n" + config.ToString());
 
     switch (config.role) {
       case Registrar:

diff --git a/src/main/java/com/google/openthread/pledge/Pledge.java b/src/main/java/com/google/openthread/pledge/Pledge.java
@@ -593,6 +593,7 @@ private CoapResponse sendRequestVoucher(VoucherRequest voucherRequest)
     // store the transmitted PVR
     this.lastPvr = voucherRequest;
     this.lastPvrCoseSigned = payload;
+    logger.debug("Voucher request: CoAP POST {} ", getURI());
     return post(payload, ExtendedMediaTypeRegistry.APPLICATION_VOUCHER_COSE_CBOR);
   }
 
@@ -672,6 +673,7 @@ private void initEndpoint(
   // here send a 'CoAP ping' to registrar to have this session built.
   private void connect() {
     setURI(getBRSKIPath());
+    logger.debug("DTLS session establishment and sending CoAP ping...");
     ping();
   }
 

diff --git a/src/main/java/com/google/openthread/pledge/PledgeMain.java b/src/main/java/com/google/openthread/pledge/PledgeMain.java
@@ -95,7 +95,7 @@ private static void runCli(Pledge pledge) {
               System.out.println(help);
               break;
             default:
-              logger.error("unknown CLI command: {}", cmd);
+              logger.error("unknown CLI command: '{}'", cmd);
               System.out.println(help);
           }
 

diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -0,0 +1,11 @@
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%date %-5level %-38(%logger{36}) -- %-64(%msg)  [%thread]%n</pattern>
+    </encoder>
+  </appender>
+
+  <root level="debug">
+    <appender-ref ref="STDOUT"/>
+  </root>
+</configuration>