Extended GError: added error logging suppression and StandardHandler()

gildor2 · Jun 27, 2020 · 363c0d7 · 363c0d7
1 parent 8891c2d
commit 363c0d7
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 62 deletions.
diff --git a/Core/Core.cpp b/Core/Core.cpp
@@ -140,6 +140,25 @@ void appNotify(const char *fmt, ...)
 	NotifyHeader[0] = 0;
 }
 
+void CErrorContext::StandardHandler()
+{
+	void (*PrintFunc)(const char*, ...);
+	PrintFunc = GError.SuppressLog ? appPrintf : appNotify;
+	// appNotify does some markup itself, add explicit marker for pure appPrintf
+	const char* Marker = GError.SuppressLog ? "\n*** " : "";
+
+	if (GError.History[0])
+	{
+//		printf("ERROR: %s\n", GError.History);
+		PrintFunc("%sERROR: %s\n", Marker, GError.History);
+	}
+	else
+	{
+//		printf("Unknown error\n");
+		PrintFunc("%sUnknown error\n", Marker);
+	}
+}
+
 void CErrorContext::LogHistory(const char *part)
 {
 	if (!History[0])

diff --git a/Core/Core.h b/Core/Core.h
@@ -291,6 +291,7 @@ void appOpenLogFile(const char *filename);
 void appPrintf(const char *fmt, ...);
 
 void appError(const char *fmt, ...);
+#define appErrorNoLog(fmt, ...) { GError.SuppressLog = true; appError(fmt, __VA_ARGS__); }
 
 
 // Log some information
@@ -511,17 +512,24 @@ struct CErrorContext
 	bool IsSwError;
 	// Used for error history formatting
 	bool WasError;
+	// Suppress logging error message to a file (in a case of user mistake)
+	bool SuppressLog;
 	// Call stack
 	char History[2048];
 
 	CErrorContext()
 	{
 		Reset();
 	}
+
 	void Reset()
 	{
 		memset(this, 0, sizeof(*this));
 	}
+
+	// Log error message to console and notify.log, do NOT exit
+	void StandardHandler();
+
 	void LogHistory(const char *part);
 };
 

diff --git a/Tools/PackageExtract/Main.cpp b/Tools/PackageExtract/Main.cpp
@@ -337,16 +337,7 @@ int main(int argc, char **argv)
 
 #if DO_GUARD
 	} CATCH {
-		if (GError.History[0])
-		{
-//			printf("ERROR: %s\n", GError.History);
-			appNotify("ERROR: %s\n", GError.History);
-		}
-		else
-		{
-//			printf("Unknown error\n");
-			appNotify("Unknown error\n");
-		}
+		GError.StandardHandler();
 		exit(1);
 	}
 #endif

diff --git a/Tools/PackageTool/Main.cpp b/Tools/PackageTool/Main.cpp
@@ -87,16 +87,7 @@ int main(int argc, char **argv)
 
 #if DO_GUARD
 	} CATCH {
-		if (GError.History[0])
-		{
-//			printf("ERROR: %s\n", GError.History);
-			appNotify("ERROR: %s\n", GError.History);
-		}
-		else
-		{
-//			printf("Unknown error\n");
-			appNotify("Unknown error\n");
-		}
+		GError.StandardHandler();
 		exit(1);
 	}
 #endif

diff --git a/Tools/PackageUnpack/Main.cpp b/Tools/PackageUnpack/Main.cpp
@@ -319,16 +319,7 @@ int main(int argc, char **argv)
 
 #if DO_GUARD
 	} CATCH {
-		if (GError.History[0])
-		{
-//			printf("ERROR: %s\n", GError.History);
-			appNotify("ERROR: %s\n", GError.History);
-		}
-		else
-		{
-//			printf("Unknown error\n");
-			appNotify("Unknown error\n");
-		}
+		GError.StandardHandler();
 		exit(1);
 	}
 #endif

diff --git a/Tools/TypeInfo/Main.cpp b/Tools/TypeInfo/Main.cpp
@@ -372,16 +372,7 @@ int main(int argc, char **argv)
 
 #if DO_GUARD
 	} CATCH {
-		if (GError.History[0])
-		{
-//			appPrintf("ERROR: %s\n", GError.History);
-			appNotify("ERROR: %s\n", GError.History);
-		}
-		else
-		{
-//			appPrintf("Unknown error\n");
-			appNotify("Unknown error\n");
-		}
+		GError.StandardHandler();
 		exit(1);
 	}
 #endif

diff --git a/Tools/UmdExtract/Main.cpp b/Tools/UmdExtract/Main.cpp
@@ -124,16 +124,7 @@ int main(int argc, char **argv)
 
 #if DO_GUARD
 	} CATCH {
-		if (GError.History[0])
-		{
-//			printf("ERROR: %s\n", GError.History);
-			appNotify("ERROR: %s\n", GError.History);
-		}
-		else
-		{
-//			printf("Unknown error\n");
-			appNotify("Unknown error\n");
-		}
+		GError.StandardHandler();
 		exit(1);
 	}
 #endif

diff --git a/UmodelTool/Main.cpp b/UmodelTool/Main.cpp
@@ -502,21 +502,12 @@ static void ExceptionHandler()
 {
 	FFileWriter::CleanupOnError();
 #if DO_GUARD
-	if (GError.History[0])
-	{
-//		appPrintf("ERROR: %s\n", GError.History);
-		appNotify("ERROR: %s\n", GError.History);
-	}
-	else
-	{
-//		appPrintf("Unknown error\n");
-		appNotify("Unknown error\n");
-	}
+	GError.StandardHandler();
 #endif // DO_GUARD
-	#if HAS_UI
+#if HAS_UI
 	if (GApplication.GuiShown)
 		GApplication.ShowErrorDialog();
-	#endif // HAS_UI
+#endif // HAS_UI
 	exit(1);
 }