Merge pull request #475 from npetzall/print_exception_message

Log Exception.getMessage() but not stacktrace.
schemaspy · Dec 7, 2018 · 1f42118 · 1f42118
2 parents 6cd278c + 4a00dcc
commit 1f42118
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 64 deletions.
diff --git a/src/main/java/org/schemaspy/cli/SchemaSpyRunner.java b/src/main/java/org/schemaspy/cli/SchemaSpyRunner.java
@@ -24,7 +24,6 @@
 import org.schemaspy.model.ConnectionFailure;
 import org.schemaspy.model.EmptySchemaException;
 import org.schemaspy.model.InvalidConfigurationException;
-import org.schemaspy.model.ProcessExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,7 +32,9 @@
 import org.springframework.boot.logging.LoggingSystem;
 import org.springframework.stereotype.Component;
 
+import java.io.IOException;
 import java.lang.invoke.MethodHandles;
+import java.sql.SQLException;
 import java.util.Arrays;
 
 @Component
@@ -105,14 +106,14 @@ private void runAnalyzer(String... args) {
             exitCode = EXIT_CODE_CONFIG_ERROR;
             LOGGER.debug("Command line parameters: {}", Arrays.asList(args));
             if (badConfig.getParamName() != null) {
-                LOGGER.error("Bad parameter: '{} = {}' , {}", badConfig.getParamName(), badConfig.getParamValue(), badConfig.getMessage(), badConfig);
+                LOGGER.error("Bad parameter: '{} = {}'", badConfig.getParamName(), badConfig.getParamValue(), badConfig);
             } else {
-                LOGGER.error("Bad config: {}", badConfig.getMessage(), badConfig);
+                LOGGER.error("Bad config", badConfig);
             }
-        } catch (ProcessExecutionException badLaunch) {
-            LOGGER.warn(badLaunch.getMessage(), badLaunch);
-        } catch (Exception exc) {
-            LOGGER.error(exc.getMessage(), exc);
+        } catch (SQLException e) {
+            LOGGER.error("SqlException", e);
+        } catch (IOException e) {
+            LOGGER.error("IOException", e);
         }
     }
 

diff --git a/src/main/java/org/schemaspy/logging/StackTraceOmitter.java b/src/main/java/org/schemaspy/logging/StackTraceOmitter.java
@@ -27,6 +27,7 @@
 import org.springframework.boot.context.event.ApplicationStartingEvent;
 import org.springframework.context.ApplicationListener;
 
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 /**
@@ -51,6 +52,9 @@ public String convert(ILoggingEvent event) {
         if (SCHEMA_SPY_LOGGER.isDebugEnabled())
             return super.convert(event);
         omittedStackTrace.set(true);
+        if (Objects.nonNull(event.getThrowableProxy())) {
+            return event.getThrowableProxy().getMessage() + CoreConstants.LINE_SEPARATOR;
+        }
         return CoreConstants.EMPTY_STRING;
     }
 

diff --git a/src/main/java/org/schemaspy/model/ProcessExecutionException.java b/src/main/java/org/schemaspy/model/ProcessExecutionException.java