fix: fcli * session login: Improve error output on previous session…

… logout failure (fixes #219)
fortify · Jan 17, 2023 · 86b0868 · 86b0868
1 parent 3a9b223
commit 86b0868
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/...mon/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionLoginCommand.java b/...mon/src/main/java/com/fortify/cli/common/session/cli/cmd/AbstractSessionLoginCommand.java
@@ -72,7 +72,8 @@ private void logoutIfSessionExists(String sessionName) {
             try {
                 logoutBeforeNewLogin(sessionName, sessionDataManager.get(sessionName, false));
             } catch ( Exception e ) {
-                LOG.warn("Error logging out previous session", e);
+                LOG.warn("Error logging out previous session");
+                LOG.debug("Exception details:", e);
             } finally {
                 sessionDataManager.destroy(sessionName);
             }

diff --git a/src/main/java/com/fortify/cli/app/log/LoggingInitializer.java b/src/main/java/com/fortify/cli/app/log/LoggingInitializer.java
@@ -30,14 +30,15 @@
 
 import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand.GenericOptionsArgGroup;
 import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand.LogLevel;
-import com.fortify.cli.common.cli.util.IFortifyCLIInitializer;
 import com.fortify.cli.common.cli.util.FortifyCLIInitializerRunner.FortifyCLIInitializerCommand;
+import com.fortify.cli.common.cli.util.IFortifyCLIInitializer;
 
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
+import ch.qos.logback.classic.layout.TTLLLayout;
 import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.ConsoleAppender;
 import ch.qos.logback.core.FileAppender;
+import ch.qos.logback.core.encoder.LayoutWrappingEncoder;
 import jakarta.inject.Singleton;
 import picocli.CommandLine;
 
@@ -72,11 +73,18 @@ public void configureLogging(GenericOptionsArgGroup genericOptions) {
     }
 
     private void configureLogFile(Logger rootLogger, String logFile) {
+    	LoggerContext loggerContext = rootLogger.getLoggerContext();
         FileAppender<ILoggingEvent> fileAppender = new FileAppender<ILoggingEvent>();
         fileAppender.setFile(logFile);
         fileAppender.setAppend(false);
-        fileAppender.setEncoder(((ConsoleAppender<ILoggingEvent>)rootLogger.getAppender("default")).getEncoder());
-        fileAppender.setContext(rootLogger.getLoggerContext());
+        LayoutWrappingEncoder<ILoggingEvent> encoder = new LayoutWrappingEncoder<ILoggingEvent>();
+        encoder.setContext(loggerContext);
+        TTLLLayout layout = new TTLLLayout();
+        layout.setContext(loggerContext);
+        layout.start();
+        encoder.setLayout(layout);
+        fileAppender.setEncoder(encoder);
+        fileAppender.setContext(loggerContext);
         fileAppender.start();
         rootLogger.addAppender(fileAppender);
     }

diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml
@@ -5,7 +5,7 @@
       <level>WARN</level>
     </filter>
     <encoder>
-        <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
+        <pattern>%msg%n</pattern>
     </encoder>
   </appender>