Correct section name for services in fbtrace config (#8500)

* Correct section name for services in fbtrace config

* Move section type paring to trace reader class

---------

Co-authored-by: Artyom Abakumov <[email protected]>

Author: Noremos

src/common/config/config_file.cpp

@@ -960,36 +960,3 @@ bool ConfigFile::Parameter::asBoolean() const
 		value.equalsNoCase("y");
 }
 
-/******************************************************************************
- *
- *	Parse name as a section key
- */
-
-ConfigFile::SectionType ConfigFile::Parameter::parseSectionKey() const
-{
-	if (name == "database")
-	{
-		return SectionType::DATABASE;
-	}
-	else if (name == "databaseName")
-	{
-		return SectionType::DATABASE_NAME;
-	}
-	else if (name == "databaseRegex")
-	{
-		return SectionType::DATABASE_REGEX;
-	}
-	else if (name == "service")
-	{
-		return SectionType::SERVICE;
-	}
-	else
-	{
-		fatal_exception::raiseFmt("error while parsing trace configuration\n\t"
-			"line %d: wrong section header, \"database\", \"databaseName\", \"databaseRegex\" or \"service\" is expected",
-			line);
-
-		// Return something to calm down the compiler
-		return SectionType::DATABASE;
-	}
-}

src/common/config/config_file.h

@@ -75,15 +75,6 @@ class ConfigFile : public Firebird::AutoStorage, public Firebird::RefCounted
 		virtual const char* getFileName() const = 0;
 	};
 
-	// Possible section types
-	enum class SectionType
-	{
-		DATABASE,
-		DATABASE_NAME,
-		DATABASE_REGEX,
-		SERVICE
-	};
-
 	struct Parameter : public AutoStorage
 	{
 		Parameter(MemoryPool& p, const Parameter& par)
@@ -96,7 +87,6 @@ class ConfigFile : public Firebird::AutoStorage, public Firebird::RefCounted
 
 		SINT64 asInteger() const;
 		bool asBoolean() const;
-		SectionType parseSectionKey() const;
 
 		KeyType name;
 		String value;

src/utilities/ntrace/TraceConfiguration.cpp

@@ -89,8 +89,8 @@ void TraceCfgReader::readConfig()
 	{
 		const ConfigFile::Parameter* section = &params[n];
 
-		const ConfigFile::SectionType sectionType = section->parseSectionKey();
-		const bool isDatabase = (sectionType != ConfigFile::SectionType::SERVICE);
+		const SectionType sectionType = parseSectionKey(section);
+		const bool isDatabase = (sectionType != SectionType::SERVICES);
 
 		const ConfigFile::String pattern = section->value;
 		bool match = false;
@@ -127,14 +127,14 @@ void TraceCfgReader::readConfig()
 			noQuotePattern.alltrim(" '\'");
 			PathName expandedName;
 
-			if (sectionType != ConfigFile::SectionType::DATABASE_REGEX && (m_databaseName == noQuotePattern ||
+			if (sectionType != SectionType::DATABASE_REGEX && (m_databaseName == noQuotePattern ||
 				(expandDatabaseName(noQuotePattern, expandedName, nullptr),
 				m_databaseName == expandedName) ))
 			{
 				// Compare by name
 				match = exactMatch = true;
 			}
-			else if (sectionType != ConfigFile::SectionType::DATABASE_NAME)
+			else if (sectionType != SectionType::DATABASE_NAME)
 			{
 				// Compare by regex
 				bool regExpOk = false;
@@ -318,3 +318,34 @@ void TraceCfgReader::expandPattern(const ConfigFile::Parameter* el, PathName& va
 		pos++;
 	}
 }
+
+TraceCfgReader::SectionType TraceCfgReader::parseSectionKey(const ConfigFile::Parameter* el) const
+{
+	fb_assert(el);
+
+	if (el->name == "database")
+	{
+		return SectionType::DATABASE;
+	}
+	else if (el->name == "databaseName")
+	{
+		return SectionType::DATABASE_NAME;
+	}
+	else if (el->name == "databaseRegex")
+	{
+		return SectionType::DATABASE_REGEX;
+	}
+	else if (el->name == "services")
+	{
+		return SectionType::SERVICES;
+	}
+	else
+	{
+		fatal_exception::raiseFmt("error while parsing trace configuration\n\t"
+			"line %d: wrong section header, \"database\", \"databaseName\", \"databaseRegex\" or \"services\" is expected",
+			el->line);
+
+		// Return something to calm down the compiler
+		return SectionType::DATABASE;
+	}
+}

src/utilities/ntrace/TraceConfiguration.h

@@ -49,6 +49,15 @@ class TraceCfgReader
 		int end;
 	};
 
+	// Possible section types
+	enum class SectionType
+	{
+		DATABASE,
+		DATABASE_NAME,
+		DATABASE_REGEX,
+		SERVICES
+	};
+
 private:
 	TraceCfgReader(const char* text, const Firebird::PathName& databaseName, TracePluginConfig& config) :
 		m_text(text),
@@ -61,6 +70,7 @@ class TraceCfgReader
 	void expandPattern(const ConfigFile::Parameter* el, Firebird::PathName& valueToExpand);
 	bool parseBoolean(const ConfigFile::Parameter* el) const;
 	ULONG parseUInteger(const ConfigFile::Parameter* el) const;
+	SectionType parseSectionKey(const ConfigFile::Parameter* el) const;
 
 	const char* const m_text;
 	const Firebird::PathName& m_databaseName;