Improve diagnostics of internal trace errors (see CORE-3413 and CORE-…

…6075)
FirebirdSQL · Jun 26, 2019 · 54221b3 · 54221b3
1 parent 4dbb997
commit 54221b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/utilities/ntrace/TraceConfiguration.cpp b/src/utilities/ntrace/TraceConfiguration.cpp
@@ -109,7 +109,10 @@ void TraceCfgReader::readConfig()
 
 		const bool isDatabase = (section->name == "database");
 		if (!isDatabase && section->name != "services")
-			continue;
+			//continue;
+			fatal_exception::raiseFmt(ERROR_PREFIX
+				"line %d: wrong section header, \"database\" or \"service\" is expected",
+				section->line);
 
 		const ConfigFile::String pattern = section->value;
 		bool match = false;

diff --git a/src/utilities/ntrace/traceplugin.cpp b/src/utilities/ntrace/traceplugin.cpp
@@ -101,7 +101,7 @@ Firebird::ITracePlugin* TraceFactoryImpl::trace_create(Firebird::CheckStatusWrap
 		{
 			const char* strEx = TracePluginImpl::marshal_exception(ex);
 			Firebird::string err;
-			if (dbname)
+			if (dbname && dbname[0])
 				err.printf("Error creating trace session for database \"%s\":\n%s\n", dbname, strEx);
 			else
 				err.printf("Error creating trace session for service manager attachment:\n%s\n", strEx);