Patches for issue #211.

Author: L'In20Cible

addons/source-python/packages/source-python/loggers.py

@@ -252,9 +252,17 @@ def _log(self, level, msg, *args, **kwargs):
         # Print to the main SP log file?
         if SP_LOG & areas:
 
+            # Patch for issue #211.
+            # Save/Overwrite the logger's name
+            name = _sp_logger.logger.name
+            _sp_logger.logger.name = self.logger.name
+
             # Print to the SP log file
             _sp_logger.logger.log(level, msg, *args, **kwargs)
 
+            # Restore the name
+            _sp_logger.logger.name = name
+
     @staticmethod
     def _get_level_value(level):
         """Return a level value used by the logging package.

src/core/modules/commands/commands_say.cpp

@@ -239,7 +239,7 @@ void SayConCommand::Dispatch( const CCommand& command )
 	}
 
 	if (!stripped_command.Tokenize(szCommand)) {
-		PythonLog(0, "Failed to tokenize '%s'.", command.GetCommandString());
+		PythonLog(0, "commands.say", "Failed to tokenize '%s'.", command.GetCommandString());
 		return;
 	}
 

src/core/modules/memory/memory_function.cpp

@@ -342,6 +342,7 @@ void CFunction::AddHook(HookType_t eType, PyObject* pCallable)
 
 	PythonLog(
 		4,
+		"memory",
 		"Hooking function: type=%s, addr=%u, conv=%s, args=%s, rtype=%s, callback=%s",
 		szType,
 		m_ulAddr,

src/core/modules/memory/memory_pointer.cpp

@@ -342,7 +342,7 @@ void CPointer::__del__(PyObject* self)
 	CPointer* ptr = extract<CPointer *>(self);
 	if (ptr->m_bAutoDealloc)
 	{
-		PythonLog(4, "Automatically deallocating pointer at %u.", ptr->m_ulAddr);
+		PythonLog(4, "memory", "Automatically deallocating pointer at %u.", ptr->m_ulAddr);
 		PreDealloc(self);
 	}
 }

src/core/modules/memory/memory_rtti.cpp

@@ -103,7 +103,7 @@ class CBaseType : public IBaseType
 		for (int i=0; i < level; ++i)
 			x += "-";
 
-		PythonLog(-1, "%s%s", x.c_str(), GetName());
+		PythonLog(-1, "memory", "%s%s", x.c_str(), GetName());
 		for (unsigned int i=0; i < GetNumBaseClasses(); ++i) {
 			GetBaseClass(i)->Dump(level + 1);
 		}

src/core/modules/memory/memory_scanner.cpp

@@ -104,34 +104,34 @@ void CBinaryFile::AddSignatureToCache(unsigned char* sigstr, int iLength, unsign
 
 bool CBinaryFile::SearchSigInCache(unsigned char* sigstr, CPointer*& result)
 {
-	PythonLog(4, "Searching for a cached signature...");
+	PythonLog(4, "memory", "Searching for a cached signature...");
 	for (std::list<Signature_t>::iterator iter=m_Signatures.begin(); iter != m_Signatures.end(); ++iter)
 	{
 		Signature_t sig = *iter;
 		if (strcmp((const char *) sig.m_szSignature, (const char *) sigstr) == 0)
 		{
-			PythonLog(4, "Found a cached signature!");
+			PythonLog(4, "memory", "Found a cached signature!");
 			result = new CPointer(sig.m_ulAddr);
 			return true;
 		}
 	}
-	PythonLog(4, "Could not find a cached signature.");
+	PythonLog(4, "memory", "Could not find a cached signature.");
 	return false;
 }
 
 bool CBinaryFile::SearchSigInBinary(object oSignature, int iLength, unsigned char* sigstr, CPointer*& result)
 {
-	PythonLog(4, "Searching in the binary...");
+	PythonLog(4, "memory", "Searching in the binary...");
 	CPointer* pPtr = FindSignatureRaw(oSignature);
 	if (pPtr->IsValid())
 	{
-		PythonLog(4, "Found a signature in the binary!");
+		PythonLog(4, "memory", "Found a signature in the binary!");
 		AddSignatureToCache(sigstr, iLength, pPtr->m_ulAddr);
 		result = pPtr;
 		return true;
 	}
 	delete pPtr;
-	PythonLog(4, "Could not find the signature in the binary.");
+	PythonLog(4, "memory", "Could not find the signature in the binary.");
 	return false;
 }
 
@@ -140,13 +140,13 @@ bool CBinaryFile::SearchSigHooked(object oSignature, int iLength, unsigned char*
 	CPointer* pPtr = FindSignatureRaw(oSignature);
 	if (!pPtr->IsValid())
 	{
-		PythonLog(4, "Could not find a hooked signature.");
+		PythonLog(4, "memory", "Could not find a hooked signature.");
 		delete pPtr;
 		return false;
 	}
 
-	PythonLog(4, "Found a hooked signature!");
-	PythonLog(4, "Checking if it's unique...");
+	PythonLog(4, "memory", "Found a hooked signature!");
+	PythonLog(4, "memory", "Checking if it's unique...");
 
 	// Add iLength, so we start searching after the match
 	CPointer new_ptr = CPointer(pPtr->m_ulAddr + len(oSignature));
@@ -159,7 +159,7 @@ bool CBinaryFile::SearchSigHooked(object oSignature, int iLength, unsigned char*
 	if (bIsValid)
 		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Found more than one hooked signatures. Please pass more bytes.");
 
-	PythonLog(4, "Signature is unique!");
+	PythonLog(4, "memory", "Signature is unique!");
 	AddSignatureToCache(sigstr, iLength, pPtr->m_ulAddr);
 	result = pPtr;
 	return true;
@@ -182,7 +182,7 @@ CPointer* CBinaryFile::FindSignature(object oSignature)
 	object oHexSig = oSignature.attr("hex")();
 	const char* szHexSig = extract<const char*>(oHexSig);
 
-	PythonLog(4, "Searching for a hooked signature (relative jump)...");
+	PythonLog(4, "memory", "Searching for a hooked signature (relative jump)...");
 	if (iLength <= 6)
 		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Signature is too short to search for a hooked signature (relative jump): %s", szHexSig);
 
@@ -191,7 +191,7 @@ CPointer* CBinaryFile::FindSignature(object oSignature)
 	if (SearchSigHooked(oSignature, iLength, sigstr, result))
 		return result;
 
-	PythonLog(4, "Searching for a hooked signature (absolute jump)...");
+	PythonLog(4, "memory", "Searching for a hooked signature (absolute jump)...");
 	if (iLength <= 7)
 		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Signature is too short to search for a hooked signature (absolute jump): %s", szHexSig);
 

src/core/sp_main.cpp

@@ -548,7 +548,7 @@ PLUGIN_RESULT CSourcePython::NetworkIDValidated( const char *pszUserName, const
 void CSourcePython::OnQueryCvarValueFinished( QueryCvarCookie_t iCookie, edict_t *pPlayerEntity,
 	EQueryCvarValueStatus eStatus, const char *pCvarName, const char *pCvarValue )
 {
-	PythonLog(4, "Cvar query (cookie: %d, status: %d) - name: %s, value: %s", iCookie, eStatus, pCvarName, pCvarValue );
+	PythonLog(4, "listeners", "Cvar query (cookie: %d, status: %d) - name: %s, value: %s", iCookie, eStatus, pCvarName, pCvarValue );
 	unsigned int iEntityIndex;
 	if (!IndexFromEdict(pPlayerEntity, iEntityIndex))
 		return;

src/core/utilities/call_python.h

@@ -75,39 +75,8 @@ T xdecref_and_return(T value)
     (3)  info
     (4)  debug
 */
-inline void PythonLog( const char* szLevel, const char* szFormat, ... )
-{
-	// Format the message
-	char szMessage[2048];
-	va_list args;
-	va_start(args, szFormat);
-	vsprintf(szMessage, szFormat, args);
-	va_end(args);
-
-	// Get the std::string instance of szMessage
-	std::string szMethod = szLevel;
-
-	// Get the method's name
-	std::string szMethodName = "log_" + szMethod;
-
-	BEGIN_BOOST_PY()
-
-		// Import the loggers module
-		object oLogModule = import("loggers");
-
-		// Get the main SP Logger instance
-		object oLogger = oLogModule.attr("_sp_logger");
-
-		// Get the PyObject instance of the logger
-		PyObject* poLogger = oLogger.ptr();
-
-		// Call the given method
-		call_method<void>( poLogger, szMethodName.c_str(), szMessage );
-
-	END_BOOST_PY()
-}
 
-inline void PythonLog( int iLevel, const char* szFormat, ... )
+inline void PythonLog( int iLevel, const char *szLogger, const char* szFormat, ... )
 {
 	// Format the message
 	char szMessage[2048];
@@ -124,6 +93,13 @@ inline void PythonLog( int iLevel, const char* szFormat, ... )
 		// Get the main SP Logger instance
 		object oLogger = oLogModule.attr("_sp_logger");
 
+		// Patch for issue #211.
+		if (szLogger != NULL) {
+			list childs = str(szLogger).split(".");
+			for (int iCurrentIndex=0; iCurrentIndex < len(childs); iCurrentIndex++)
+				oLogger = oLogger[childs[iCurrentIndex]];
+		}
+
 		// Get the PyObject instance logger
 		PyObject* poLogger = oLogger.ptr();