ExceptionDBGit* change some behaviour to see better detailed error messages, also aware of -verbose call option

rocket-3 · rocket-3 · commit 51e8fa000ad1 · 2020-11-06T23:59:22.000+03:00
diff --git a/src/main/java/ru/fusionsoft/dbgit/core/ExceptionDBGit.java b/src/main/java/ru/fusionsoft/dbgit/core/ExceptionDBGit.java
@@ -24,12 +24,27 @@ public ExceptionDBGit(Object msg) {
 	}
 	
 	public ExceptionDBGit(String msg) {
-		this(msg, new Exception(msg));
+		super(msg);
+		rollbackConnection();
+		ConsoleWriter.printlnRed(msg);
+		ConsoleWriter.detailsPrintLn(ExceptionUtils.getStackTrace(this));
+		logger.error(msg);
+		System.exit(1);
 	}
 	
 	public ExceptionDBGit(String message, Throwable cause) {
-		super(message, cause);
+//		super(message, cause);
+		rollbackConnection();
+		ConsoleWriter.printlnRed(message);
+		if(!cause.getMessage().equals(message)) {
+			ConsoleWriter.printlnRed(cause.getLocalizedMessage());
+		}
+		ConsoleWriter.detailsPrintLn(ExceptionUtils.getStackTrace(cause));
 		logger.error(message, cause);
+		System.exit(1);
+	}
+
+	private void rollbackConnection() {
 		try{
 			DBConnection conn = DBConnection.getInstance();
 			conn.getConnect().rollback();
@@ -40,12 +55,8 @@ public ExceptionDBGit(String message, Throwable cause) {
 				ConsoleWriter.printlnRed(ex.getLocalizedMessage());
 			}
 		}
-		ConsoleWriter.printlnRed(message);
-		ConsoleWriter.detailsPrintLn(ExceptionUtils.getStackTrace(cause));
-		logger.error(message, cause);
-		System.exit(1);
 	}
-	
+
 	public ExceptionDBGit(Throwable cause) {
 		super(cause);
 		logger.error(cause.getLocalizedMessage(), cause);
diff --git a/src/main/java/ru/fusionsoft/dbgit/core/ExceptionDBGitRestore.java b/src/main/java/ru/fusionsoft/dbgit/core/ExceptionDBGitRestore.java
@@ -8,16 +8,13 @@ public class ExceptionDBGitRestore extends ExceptionDBGit {
 
 	public ExceptionDBGitRestore(String msg) {
 		super(msg);
-		ConsoleWriter.println("\n" + msg);
 	}
 	
 	public ExceptionDBGitRestore(String message, Throwable cause) {		
 		super(message, cause);
-		ConsoleWriter.println("\n" + message + "\n" + cause.getLocalizedMessage());
 	}
 	
 	public ExceptionDBGitRestore(Throwable cause) {
 		super(cause);
-		ConsoleWriter.println(cause.getLocalizedMessage());
 	}
 }
diff --git a/src/main/java/ru/fusionsoft/dbgit/core/ExceptionDBGitRunTime.java b/src/main/java/ru/fusionsoft/dbgit/core/ExceptionDBGitRunTime.java
@@ -28,8 +28,15 @@ public ExceptionDBGitRunTime(String message, Throwable cause) {
 				ConsoleWriter.printlnRed(ex.getLocalizedMessage());
 			}
 		}
-		ConsoleWriter.printlnRed(message);
-		ConsoleWriter.detailsPrintLn(ExceptionUtils.getStackTrace(cause));
+		ConsoleWriter.printlnRed(message );
+
+		if(cause instanceof SQLException){
+			ConsoleWriter.printlnRed(ExceptionUtils.getStackTrace(cause));
+
+		} else if ( !message.equals(cause.getMessage()) ){
+			ConsoleWriter.printlnRed(cause.getMessage() );
+			ConsoleWriter.detailsPrintLn(ExceptionUtils.getStackTrace(cause));
+		}
 		logger.error(message, cause);
 		System.exit(1);
 

Original file line number	Diff line number	Diff line change
`@@ -8,16 +8,13 @@ public class ExceptionDBGitRestore extends ExceptionDBGit {`
`8`	`8`
`9`	`9`	`public ExceptionDBGitRestore(String msg) {`
`10`	`10`	`super(msg);`
`11`		`- ConsoleWriter.println("\n" + msg);`
`12`	`11`	`}`
`13`	`12`
`14`	`13`	`public ExceptionDBGitRestore(String message, Throwable cause) {`
`15`	`14`	`super(message, cause);`
`16`		`- ConsoleWriter.println("\n" + message + "\n" + cause.getLocalizedMessage());`
`17`	`15`	`}`
`18`	`16`
`19`	`17`	`public ExceptionDBGitRestore(Throwable cause) {`
`20`	`18`	`super(cause);`
`21`		`- ConsoleWriter.println(cause.getLocalizedMessage());`
`22`	`19`	`}`
`23`	`20`	`}`