Minor logging improvements

jline · Nov 4, 2016 · 6285fdd · 6285fdd
1 parent a408dd3
commit 6285fdd
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 10 deletions.
diff --git a/src/main/java/org/jline/reader/impl/LineReaderImpl.java b/src/main/java/org/jline/reader/impl/LineReaderImpl.java
@@ -613,7 +613,7 @@ public void callWidget(String name) {
                 w.apply();
             }
         } catch (Throwable t) {
-            Log.debug("Error executing widget '" + name + "'", t);
+            Log.debug("Error executing widget '", name, "'", t);
         }
     }
 

diff --git a/src/main/java/org/jline/terminal/TerminalBuilder.java b/src/main/java/org/jline/terminal/TerminalBuilder.java
@@ -127,9 +127,9 @@ public TerminalBuilder signalHandler(Terminal.SignalHandler signalHandler) {
 
     public Terminal build() throws IOException {
         Terminal terminal = doBuild();
-        Log.debug("Using terminal " + terminal.getClass().getSimpleName());
+        Log.debug(() -> "Using terminal " + terminal.getClass().getSimpleName());
         if (terminal instanceof AbstractPosixTerminal) {
-            Log.debug("Using pty " + ((AbstractPosixTerminal) terminal).getPty().getClass().getSimpleName());
+            Log.debug(() -> "Using pty " + ((AbstractPosixTerminal) terminal).getPty().getClass().getSimpleName());
         }
         return terminal;
     }
@@ -160,7 +160,7 @@ else if (OSUtils.IS_WINDOWS) {
                     try {
                         return new JnaWinSysTerminal(name, nativeSignals, signalHandler);
                     } catch (Throwable t) {
-                        Log.debug("Error creating JNA based pty", t.getMessage());
+                        Log.debug("Error creating JNA based pty: ", t.getMessage(), t);
                     }
                 }
                 return new JansiWinSysTerminal(name, nativeSignals, signalHandler);
@@ -171,15 +171,15 @@ else if (OSUtils.IS_WINDOWS) {
                         pty = JnaNativePty.current();
                     } catch (Throwable t) {
                         // ignore
-                        Log.debug("Error creating JNA based pty", t.getMessage());
+                        Log.debug("Error creating JNA based pty: ", t.getMessage(), t);
                     }
                 }
                 if (pty == null) {
                     try {
                         pty = ExecPty.current();
                     } catch (IOException e) {
                         // Ignore if not a tty
-                        Log.debug("Error creating exec based pty", e.getMessage());
+                        Log.debug("Error creating exec based pty: ", e.getMessage(), e);
                     }
                 }
                 if (pty != null) {
@@ -197,7 +197,7 @@ else if (OSUtils.IS_WINDOWS) {
                     Pty pty = JnaNativePty.open(attributes, size);
                     return new PosixPtyTerminal(name, type, pty, in, out, encoding, signalHandler);
                 } catch (Throwable t) {
-                    Log.debug("Error creating JNA based pty", t.getMessage());
+                    Log.debug("Error creating JNA based pty: ", t.getMessage(), t);
                 }
             }
             Terminal terminal = new ExternalTerminal(name, type, in, out, encoding, signalHandler);

diff --git a/src/main/java/org/jline/utils/Log.java b/src/main/java/org/jline/utils/Log.java
@@ -10,6 +10,7 @@
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
+import java.util.function.Supplier;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import java.util.logging.Logger;
@@ -27,6 +28,10 @@ public static void trace(final Object... messages) {
         log(Level.FINEST, messages);
     }
 
+    public static void debug(Supplier<String> supplier) {
+        log(Level.FINE, supplier);
+    }
+
     public static void debug(final Object... messages) {
         log(Level.FINE, messages);
     }
@@ -64,8 +69,7 @@ static void render(final PrintStream out, final Object message) {
         }
     }
 
-    static void log(final Level level, final Object... messages) {
-        Logger logger = Logger.getLogger("org.jline");
+    static LogRecord createRecord(final Level level, final Object... messages) {
         Throwable cause = null;
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         PrintStream ps = new PrintStream(baos);
@@ -81,7 +85,26 @@ static void log(final Level level, final Object... messages) {
         ps.close();
         LogRecord r = new LogRecord(level, baos.toString());
         r.setThrown(cause);
-        logger.log(r);
+        return r;
+    }
+
+    static LogRecord createRecord(final Level level, final Supplier<String> message) {
+        return new LogRecord(level, message.get());
+    }
+
+    static void log(final Level level, final Supplier<String> message) {
+        logr(level, () -> createRecord(level, message));
+    }
+
+    static void log(final Level level, final Object... messages) {
+        logr(level, () -> createRecord(level, messages));
+    }
+
+    static void logr(final Level level, final Supplier<LogRecord> record) {
+        Logger logger = Logger.getLogger("org.jline");
+        if (logger.isLoggable(level)) {
+            logger.log(record.get());
+        }
     }
 
 }