logging: use channel names from marker

diff --git a/acid/src/main/java/net/rizon/acid/logging/Logger.java b/acid/src/main/java/net/rizon/acid/logging/Logger.java
index 4ff932c6a0efc8047c009deca38ec5a2ccb72d66..c04dd5a1610b8a90895ab51222b4767e2bddc37f 100644 (file)
--- a/acid/src/main/java/net/rizon/acid/logging/Logger.java
+++ b/acid/src/main/java/net/rizon/acid/logging/Logger.java
@@ -11,6 +11,7 @@ import net.rizon.acid.core.AcidCore;
 import net.rizon.acid.core.Acidictive;
 import net.rizon.acid.core.User;
 import net.rizon.acid.util.Format;
+import org.slf4j.Marker;
 
 public class Logger extends UnsynchronizedAppenderBase<ILoggingEvent>
 {
@@ -43,6 +44,7 @@ public class Logger extends UnsynchronizedAppenderBase<ILoggingEvent>
 
                String message = event.getFormattedMessage();
                IThrowableProxy throwable = event.getThrowableProxy();
+               Marker marker = event.getMarker();
                StackTraceElement[] stes = null;
 
                if (throwable != null)
@@ -57,7 +59,16 @@ public class Logger extends UnsynchronizedAppenderBase<ILoggingEvent>
 
                if (AcidCore.me != null && !AcidCore.me.isBursting() && User.findUser(Acidictive.conf.general.control) != null)
                {
-                       String routingSpam = Acidictive.conf.getChannelNamed("routing-spam");
+                       String routingSpam;
+
+                       if (marker != null)
+                       {
+                               routingSpam = Acidictive.conf.getChannelNamed(marker.getName());
+                       }
+                       else
+                       {
+                               routingSpam = Acidictive.conf.getChannelNamed("routing-spam");
+                       }
 
                        if (message != null)
                        {