Heavily refactored modules around. Added RandomEventGenerator. Added CSS for EventLogServlet.

Author: cipriancraciun

logback-amqp-appender/src/main/java/ro/volution/dev/logback/amqp/appender/AmqpAppender.java

@@ -5,23 +5,19 @@
 import java.io.Serializable;
 import java.util.concurrent.LinkedBlockingDeque;
 
-import ro.volution.dev.logback.amqp.common.DefaultMutator;
-import ro.volution.dev.logback.amqp.common.Mutator;
-
-import ro.volution.dev.logback.amqp.common.Callbacks;
-import ro.volution.dev.logback.amqp.common.DefaultBinarySerializer;
-import ro.volution.dev.logback.amqp.common.DefaultContextAwareCallbacks;
-import ro.volution.dev.logback.amqp.common.SerializableLoggingEvent1;
-import ro.volution.dev.logback.amqp.common.Serializer;
-
-import ro.volution.dev.logback.amqp.accessors.AmqpMessage;
-import ro.volution.dev.logback.amqp.accessors.AmqpPublisher;
-
-
 import ch.qos.logback.classic.PatternLayout;
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.core.Context;
 import ch.qos.logback.core.UnsynchronizedAppenderBase;
+import ro.volution.dev.logback.amqp.accessors.AmqpMessage;
+import ro.volution.dev.logback.amqp.accessors.AmqpPublisher;
+import ro.volution.dev.logback.common.Callbacks;
+import ro.volution.dev.logback.common.DefaultBinarySerializer;
+import ro.volution.dev.logback.common.DefaultContextAwareCallbacks;
+import ro.volution.dev.logback.common.DefaultEventMutator;
+import ro.volution.dev.logback.common.DefaultSerializableEvent1;
+import ro.volution.dev.logback.common.EventMutator;
+import ro.volution.dev.logback.common.Serializer;
 
 
 public class AmqpAppender
@@ -36,7 +32,7 @@ public AmqpAppender ()
 		this.routingKeyLayout = new PatternLayout ();
 		this.exchangeLayout.setPattern (AmqpAppender.defaultExchangeKeyPattern);
 		this.routingKeyLayout.setPattern (AmqpAppender.defaultRoutingKeyPattern);
-		this.mutator = new DefaultMutator ();
+		this.mutator = new DefaultEventMutator ();
 		this.serializer = new DefaultBinarySerializer ();
 		this.publisher = null;
 	}
@@ -51,7 +47,7 @@ public final String getHost ()
 		return (this.host);
 	}
 
-	public final Mutator getMutator ()
+	public final EventMutator getMutator ()
 	{
 		return (this.mutator);
 	}
@@ -120,7 +116,7 @@ public final void setHost (final String host)
 		this.host = host;
 	}
 
-	public final void setMutator (final Mutator mutator)
+	public final void setMutator (final EventMutator mutator)
 	{
 		if (this.isStarted ())
 			throw (new IllegalStateException ("amqp appender is already started"));
@@ -200,23 +196,26 @@ public final void stop ()
 
 	protected final void append (final ILoggingEvent originalEvent)
 	{
-		final Serializable event = this.prepare (originalEvent);
-		byte[] data;
+		final Serializable event;
+		try {
+			event = this.prepare (originalEvent);
+		} catch (final Throwable exception) {
+			this.addError ("amqp appender encountered an error while preparing the event; ignoring!", exception);
+			return;
+		}
+		final byte[] data;
 		try {
 			data = this.serializer.serialize (event);
 		} catch (final Throwable exception) {
-			data = null;
 			this.addError ("amqp appender encountered an error while serializing the event; ignoring!", exception);
+			return;
 		}
-		if (data != null) {
-			final String exchange = this.exchangeLayout.doLayout (originalEvent);
-			final String routingKey = this.routingKeyLayout.doLayout (originalEvent);
-			final AmqpMessage message =
-					new AmqpMessage (
-							exchange, routingKey, this.serializer.getContentType (), this.serializer.getContentEncoding (),
-							data);
-			this.buffer.add (message);
-		}
+		final String exchange = this.exchangeLayout.doLayout (originalEvent);
+		final String routingKey = this.routingKeyLayout.doLayout (originalEvent);
+		final AmqpMessage message =
+				new AmqpMessage (
+						exchange, routingKey, this.serializer.getContentType (), this.serializer.getContentEncoding (), data);
+		this.buffer.add (message);
 	}
 
 	protected void postStart ()
@@ -232,8 +231,9 @@ protected void preStop ()
 	{}
 
 	private final Serializable prepare (final ILoggingEvent originalEvent)
+			throws Throwable
 	{
-		final SerializableLoggingEvent1 newEvent = SerializableLoggingEvent1.build (originalEvent);
+		final DefaultSerializableEvent1 newEvent = DefaultSerializableEvent1.build (originalEvent);
 		if (this.mutator != null)
 			this.mutator.mutate (newEvent);
 		return (newEvent);
@@ -243,7 +243,7 @@ private final Serializable prepare (final ILoggingEvent originalEvent)
 	private final LinkedBlockingDeque<AmqpMessage> buffer;
 	private final PatternLayout exchangeLayout;
 	private String host;
-	private Mutator mutator;
+	private EventMutator mutator;
 	private String password;
 	private Integer port;
 	private AmqpPublisher publisher;

logback-amqp-appender/src/test/java/ro/volution/dev/logback/amqp/tests/AmqpAppenderTests.java

@@ -2,15 +2,12 @@
 package ro.volution.dev.logback.amqp.tests;
 
 
-import java.util.UUID;
-
-import ro.volution.dev.logback.amqp.common.DefaultMutator;
-
-import ro.volution.dev.logback.amqp.appender.AmqpAppender;
-
 import ch.qos.logback.classic.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.MDC;
+import ro.volution.dev.logback.amqp.appender.AmqpAppender;
+import ro.volution.dev.logback.common.DefaultEventMutator;
+import ro.volution.dev.logback.common.RandomEventGenerator;
 
 import org.junit.Assert;
 import org.junit.Test;
@@ -35,15 +32,14 @@ public final void testAppender ()
 		testLogger.addAppender (appender);
 		testLogger.setAdditive (false);
 
+		final RandomEventGenerator generator = new RandomEventGenerator (AmqpAppenderTests.class.getName (), testLogger);
 		realLogger.debug ("logging generated messages");
+		MDC.clear ();
 		for (int index = 0; index < AmqpAppenderTests.messageCount; index++) {
-			MDC.put (DefaultMutator.applicationKey, String.format ("app-%d", index % 3 + 1));
-			MDC.put (DefaultMutator.componentKey, String.format ("comp-%d", index % 2 + 1));
-			final String message = UUID.randomUUID ().toString ();
-			if (index % 4 != 0)
-				testLogger.error (message);
-			else
-				testLogger.error (message, new Throwable (message));
+			MDC.put (DefaultEventMutator.applicationKey, String.format ("app-%d", index % 3 + 1));
+			MDC.put (DefaultEventMutator.componentKey, String.format ("comp-%d", index % 2 + 1));
+			testLogger.callAppenders (generator.generate ());
+			MDC.clear ();
 		}
 
 		realLogger.debug ("waiting for message draining (i.e. until their all sent)");

logback-amqp-common/pom.xml

@@ -14,5 +14,10 @@
 			<artifactId>amqp-client</artifactId>
 			<version>2.2.0</version>
 		</dependency>
+		<dependency>
+			<groupId>ro.volution.dev</groupId>
+			<artifactId>logback-common</artifactId>
+			<version>${project.version}</version>
+		</dependency>
 	</dependencies>
 </project>

logback-amqp-common/src/main/java/ro/volution/dev/logback/amqp/accessors/AmqpAccessor.java

@@ -2,14 +2,13 @@
 package ro.volution.dev.logback.amqp.accessors;
 
 
-import ro.volution.dev.logback.amqp.common.Callbacks;
-
 import ch.qos.logback.classic.Level;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Connection;
 import com.rabbitmq.client.ConnectionFactory;
 import com.rabbitmq.client.ShutdownListener;
 import com.rabbitmq.client.ShutdownSignalException;
+import ro.volution.dev.logback.common.Callbacks;
 
 
 public abstract class AmqpAccessor

logback-amqp-common/src/main/java/ro/volution/dev/logback/amqp/accessors/AmqpConsumer.java

@@ -4,14 +4,13 @@
 
 import java.util.concurrent.LinkedBlockingQueue;
 
-import ro.volution.dev.logback.amqp.common.Callbacks;
-
 import ch.qos.logback.classic.Level;
 import com.rabbitmq.client.AMQP.BasicProperties;
 import com.rabbitmq.client.Channel;
 import com.rabbitmq.client.Consumer;
 import com.rabbitmq.client.Envelope;
 import com.rabbitmq.client.ShutdownSignalException;
+import ro.volution.dev.logback.common.Callbacks;
 
 
 public final class AmqpConsumer

logback-amqp-common/src/main/java/ro/volution/dev/logback/amqp/accessors/AmqpPublisher.java

@@ -5,11 +5,10 @@
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.concurrent.TimeUnit;
 
-import ro.volution.dev.logback.amqp.common.Callbacks;
-
 import ch.qos.logback.classic.Level;
 import com.rabbitmq.client.AMQP;
 import com.rabbitmq.client.Channel;
+import ro.volution.dev.logback.common.Callbacks;
 
 
 public final class AmqpPublisher

logback-amqp-common/src/main/java/ro/volution/dev/logback/amqp/common/Mutator.java

@@ -17,7 +17,7 @@
 		</dependency>
 		<dependency>
 			<groupId>ro.volution.dev</groupId>
-			<artifactId>logback-webapp-lib</artifactId>
+			<artifactId>logback-webapp-common</artifactId>
 			<version>${project.version}</version>
 		</dependency>
 	</dependencies>

logback-amqp-consumer-webapp/pom.xml

@@ -4,7 +4,8 @@
 
 	<statusListener class="ch.qos.logback.core.status.OnConsoleStatusListener" />
 
-	<newRule pattern="/configuration/amqpConsumerAgent" actionClass="ro.volution.dev.logback.amqp.consumer.AmqpConsumerAgentMain$AgentAction"/>
+	<newRule pattern="/configuration/amqpConsumerAgent" actionClass="ro.volution.dev.logback.amqp.consumer.AmqpConsumerAgentMain$JoranAction" />
+	<newRule pattern="/configuration/randomEventGenerator" actionClass="ro.volution.dev.logback.common.RandomEventGenerator$JoranAction" />
 
 	<amqpConsumerAgent>
 		<host>127.0.0.1</host>
@@ -17,6 +18,11 @@
 		<routingKey>#</routingKey>
 	</amqpConsumerAgent>
 
+	<randomEventGenerator>
+		<count>1000</count>
+		<interval>250</interval>
+	</randomEventGenerator>
+	
 	<appender name="webapp" class="ro.volution.dev.logback.webapp.EventLogAppender" />
 
 	<root level="trace">

logback-amqp-consumer-webapp/src/main/resources/logback.xml

@@ -5,14 +5,6 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import ro.volution.dev.logback.amqp.common.Callbacks;
-import ro.volution.dev.logback.amqp.common.DefaultBinarySerializer;
-import ro.volution.dev.logback.amqp.common.DefaultContextAwareCallbacks;
-import ro.volution.dev.logback.amqp.common.Serializer;
-
-import ro.volution.dev.logback.amqp.accessors.AmqpConsumer;
-import ro.volution.dev.logback.amqp.accessors.AmqpMessage;
-
 import ch.qos.logback.classic.Level;
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.spi.ILoggingEvent;
@@ -22,6 +14,12 @@
 import ch.qos.logback.core.spi.FilterReply;
 import ch.qos.logback.core.spi.LifeCycle;
 import org.slf4j.LoggerFactory;
+import ro.volution.dev.logback.amqp.accessors.AmqpConsumer;
+import ro.volution.dev.logback.amqp.accessors.AmqpMessage;
+import ro.volution.dev.logback.common.Callbacks;
+import ro.volution.dev.logback.common.DefaultBinarySerializer;
+import ro.volution.dev.logback.common.DefaultContextAwareCallbacks;
+import ro.volution.dev.logback.common.Serializer;
 
 
 public class AmqpConsumerAgent

logback-amqp-consumer/src/main/java/ro/volution/dev/logback/amqp/consumer/AmqpConsumerAgent.java

@@ -69,15 +69,40 @@ public static final void main (final String[] arguments)
 		System.exit (1);
 	}
 
-	public static final class AgentAction
+	public static final class Configurator
+			extends JoranConfigurator
+	{
+		public Configurator (final List<AmqpConsumerAgent> agents)
+		{
+			super ();
+			this.agentAction = new JoranAction (agents, false);
+			this.agentAction.setContext (this.getContext ());
+		}
+		
+		public final void addInstanceRules (final RuleStore rules)
+		{
+			super.addInstanceRules (rules);
+			rules.addRule (new Pattern ("/configuration/amqpConsumerAgent"), this.agentAction);
+		}
+		
+		public final void setContext (final Context context)
+		{
+			super.setContext (context);
+			this.agentAction.setContext (context);
+		}
+		
+		private final JoranAction agentAction;
+	}
+	
+	public static final class JoranAction
 			extends Action
 	{
-		public AgentAction ()
+		public JoranAction ()
 		{
 			this (null, true);
 		}
 
-		public AgentAction (final List<AmqpConsumerAgent> agents, final boolean autoStart)
+		public JoranAction (final List<AmqpConsumerAgent> agents, final boolean autoStart)
 		{
 			super ();
 			this.agents = agents;
@@ -111,29 +136,4 @@ public void end (final InterpretationContext ic, final String name)
 		private final List<AmqpConsumerAgent> agents;
 		private final boolean autoStart;
 	}
-	
-	public static final class Configurator
-			extends JoranConfigurator
-	{
-		public Configurator (final List<AmqpConsumerAgent> agents)
-		{
-			super ();
-			this.agentAction = new AgentAction (agents, false);
-			this.agentAction.setContext (this.getContext ());
-		}
-		
-		public final void addInstanceRules (final RuleStore rules)
-		{
-			super.addInstanceRules (rules);
-			rules.addRule (new Pattern ("/configuration/amqpConsumerAgent"), this.agentAction);
-		}
-		
-		public final void setContext (final Context context)
-		{
-			super.setContext (context);
-			this.agentAction.setContext (context);
-		}
-		
-		private final AgentAction agentAction;
-	}
 }