Fixed redundant prefixing of messages logged by the sp command.

Author: jordanbriere

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

@@ -233,6 +233,9 @@ def _log(self, level, msg, *args, **kwargs):
         # Get the areas to be used
         areas = self.areas
 
+        # Get wether we should prepend prefix
+        prepend_prefix = kwargs.pop('prepend_prefix', self.prefix is not None)
+
         # Print to main log file?
         if MAIN_LOG & areas:
 
@@ -249,8 +252,7 @@ def _log(self, level, msg, *args, **kwargs):
             message = _main_log_formatter.format(record)
 
             # Prepend prefix
-            prefix = self.prefix
-            if prefix is not None:
+            if prepend_prefix:
                 message = prefix + message
 
             # Print to the main log
@@ -265,9 +267,8 @@ def _log(self, level, msg, *args, **kwargs):
             from core import echo_console
 
             # Prepend prefix
-            prefix = self.prefix
-            if prefix is not None:
-                msg = prefix + msg
+            if prepend_prefix:
+                msg = self.prefix + msg
 
             echo_console(msg)
 

addons/source-python/packages/source-python/plugins/command.py

@@ -269,4 +269,4 @@ def log_message(self, message):
         :param str message:
             Message to log.
         """
-        self.logger.log_message(self.prefix + message)
+        self.logger.log_message(self.prefix + message, prepend_prefix=False)