--

Author: cipriancraciun

logback-amqp-appender/src/main/java/ch/qos/logback/amqp/AmqpAppender.java

@@ -174,8 +174,7 @@ public final void start ()
 		this.routingKeyLayout.start ();
 		this.publisher =
 				new AmqpPublisher (
-						this.host, this.port, this.virtualHost, this.username, this.password,
-						this.callbacks, this.buffer);
+						this.host, this.port, this.virtualHost, this.username, this.password, this.callbacks, this.buffer);
 		this.publisher.start ();
 		super.start ();
 		this.postStart ();
@@ -214,15 +213,15 @@ protected final void append (final ILoggingEvent originalEvent)
 		}
 	}
 
-	protected void preStart ()
-	{}
-	
 	protected void postStart ()
 	{}
 
 	protected void postStop ()
 	{}
 
+	protected void preStart ()
+	{}
+	
 	protected void preStop ()
 	{}
 
@@ -234,6 +233,7 @@ private final Serializable prepare (final ILoggingEvent originalEvent)
 		return (newEvent);
 	}
 
+	protected final Callbacks callbacks;
 	private final LinkedBlockingDeque<AmqpMessage> buffer;
 	private final PatternLayout exchangeLayout;
 	private String host;
@@ -245,7 +245,6 @@ private final Serializable prepare (final ILoggingEvent originalEvent)
 	private Serializer serializer;
 	private String username;
 	private String virtualHost;
-	protected final Callbacks callbacks;
 
 	public static final String defaultExchangeKeyPattern = "logback%nopex";
 	public static final String defaultRoutingKeyPattern = "%level%nopex";

logback-amqp-common/src/main/java/ch/qos/logback/amqp/AmqpConsumer.java

@@ -132,14 +132,16 @@ private final boolean declare ()
 		}
 		{
 			this.callbacks.handleLogEvent (
-					Level.INFO, null, "amqp consumer binding the queue `%s` to exchange `%s` with routing key `%s`", this.queue1, this.exchange, this.routingKey);
+					Level.INFO, null, "amqp consumer binding the queue `%s` to exchange `%s` with routing key `%s`",
+					this.queue1, this.exchange, this.routingKey);
 			try {
 				channel.queueBind (this.queue1, this.exchange, this.routingKey, null);
 			} catch (final Throwable exception) {
-				this.callbacks.handleException (
-						exception,
-						"amqp consumer encountered an error while binding the queue `%s` to exchange `%s` with routing key `%s`; aborting!",
-						this.queue1, this.exchange, this.routingKey);
+				this.callbacks
+						.handleException (
+								exception,
+								"amqp consumer encountered an error while binding the queue `%s` to exchange `%s` with routing key `%s`; aborting!",
+								this.queue1, this.exchange, this.routingKey);
 				return (false);
 			}
 		}
@@ -162,8 +164,8 @@ private final boolean register ()
 
 	private final String exchange;
 	private final String queue;
-	private final String routingKey;
 	private String queue1;
+	private final String routingKey;
 	private final LinkedBlockingQueue<AmqpMessage> sink;
 
 	private final class ConsumerCallback

logback-amqp-consumer/src/main/java/ch/qos/logback/amqp/AmqpConsumerAgent.java

@@ -5,8 +5,6 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.TimeUnit;
 
-import ch.qos.logback.core.spi.FilterReply;
-
 import ch.qos.logback.amqp.tools.Callbacks;
 import ch.qos.logback.amqp.tools.DefaultBinarySerializer;
 import ch.qos.logback.amqp.tools.DefaultContextAwareCallbacks;
@@ -17,6 +15,7 @@
 import ch.qos.logback.core.Context;
 import ch.qos.logback.core.filter.Filter;
 import ch.qos.logback.core.spi.ContextAwareBase;
+import ch.qos.logback.core.spi.FilterReply;
 import ch.qos.logback.core.spi.LifeCycle;
 import org.slf4j.LoggerFactory;
 

logback-amqp-consumer/src/main/java/ch/qos/logback/amqp/AmqpConsumerAgentMain.java

@@ -108,8 +108,8 @@ public void end (final InterpretationContext ic, final String name)
 		}
 
 		private AmqpConsumerAgent agent;
-		private final boolean autoStart;
 		private final List<AmqpConsumerAgent> agents;
+		private final boolean autoStart;
 	}
 
 	public static final class Configurator

logback-webapp-lib/src/main/java/ch/qos/logback/webapp/EventViewerLayout.java

@@ -35,17 +35,17 @@ public EventViewerLayout ()
 		this.pattern = EventViewerLayout.defaultPattern;
 	}
 
-	public String doLayout (final ILoggingEvent event)
+	public String doHeaderLayout ()
 	{
 		final StringBuilder buffer = new StringBuilder ();
-		this.doLayout (event, buffer);
+		this.doHeaderLayout (buffer);
 		return buffer.toString ();
 	}
 
-	public String doHeaderLayout ()
+	public String doLayout (final ILoggingEvent event)
 	{
 		final StringBuilder buffer = new StringBuilder ();
-		this.doHeaderLayout (buffer);
+		this.doLayout (event, buffer);
 		return buffer.toString ();
 	}
 
@@ -141,33 +141,33 @@ protected void buildConverters ()
 		}
 	}
 
-	protected void doLayout (final ILoggingEvent event, final StringBuilder buffer)
+	protected void doHeaderLayout (final StringBuilder buffer)
 	{
-		buffer.append ("<tr class=\"Event " + event.getLevel ().levelStr + "\">\n");
+		buffer.append ("<tr class=\"EventHeader\">\n");
 		Converter<ILoggingEvent> converter = this.convertersHead;
 		while (converter != null) {
-			buffer.append ("<td class=\"Event " + this.getConverterName (converter).replace ("\"", "\\\"") + "\">");
-			converter.write (buffer, event);
-			buffer.append ("</td>\n");
+			final String converterName = this.getConverterName (converter);
+			buffer.append ("<th class=\"EventHeader " + converterName.replace ("\"", "\\\"") + "\">");
+			buffer.append (Transform.escapeTags (converterName));
+			buffer.append ("</th>\n");
 			converter = converter.getNext ();
 		}
 		buffer.append ("</tr>\n");
-		if (event.getThrowableProxy () != null)
-			this.doLayout (event.getThrowableProxy (), buffer);
 	}
 
-	protected void doHeaderLayout (final StringBuilder buffer)
+	protected void doLayout (final ILoggingEvent event, final StringBuilder buffer)
 	{
-		buffer.append ("<tr class=\"EventHeader\">\n");
+		buffer.append ("<tr class=\"Event " + event.getLevel ().levelStr + "\">\n");
 		Converter<ILoggingEvent> converter = this.convertersHead;
 		while (converter != null) {
-			final String converterName = this.getConverterName (converter);
-			buffer.append ("<th class=\"EventHeader " + converterName.replace ("\"", "\\\"") + "\">");
-			buffer.append (Transform.escapeTags (converterName));
-			buffer.append ("</th>\n");
+			buffer.append ("<td class=\"Event " + this.getConverterName (converter).replace ("\"", "\\\"") + "\">");
+			converter.write (buffer, event);
+			buffer.append ("</td>\n");
 			converter = converter.getNext ();
 		}
 		buffer.append ("</tr>\n");
+		if (event.getThrowableProxy () != null)
+			this.doLayout (event.getThrowableProxy (), buffer);
 	}
 
 	protected void doLayout (final IThrowableProxy throwableHead, final StringBuilder buffer)