Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ public class SimpleSocketServer extends Thread {
// used for testing purposes
private CountDownLatch latch;

// Set this appender as the sole appender for the remoteLogger
private String serverAppender;

public static void main(String argv[]) throws Exception {
doMain(SimpleSocketServer.class, argv);
}
Expand All @@ -80,9 +83,14 @@ protected static void doMain(Class<? extends SimpleSocketServer> serverClass, St
sss.start();
}

public SimpleSocketServer(LoggerContext lc, int port) {
public SimpleSocketServer(LoggerContext lc, int port, String serverAppender) {
this.lc = lc;
this.port = port;
this.serverAppender = serverAppender;
}

public SimpleSocketServer(LoggerContext lc, int port) {
this(lc, port, null);
}

public void run() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,20 @@ public class SocketNode implements Runnable {
boolean closed = false;
SimpleSocketServer socketServer;

public SocketNode(SimpleSocketServer socketServer, Socket socket, LoggerContext context) {
// Set this appender as the sole appender for the remoteLogger
private String serverAppender;

public SocketNode(SimpleSocketServer socketServer, Socket socket, LoggerContext context, String serverAppender) {
this.socketServer = socketServer;
this.socket = socket;
remoteSocketAddress = socket.getRemoteSocketAddress();
this.context = context;
logger = context.getLogger(SocketNode.class);
logger = context.getLogger(ch.qos.logback.classic.net.SocketNode.class);
this.serverAppender = serverAppender;
}

public SocketNode(SimpleSocketServer socketServer, Socket socket, LoggerContext context) {
this(socketServer, socket, context, null);
}

// public
Expand All @@ -75,15 +83,24 @@ public void run() {
}

ILoggingEvent event;
Logger remoteLogger;
Logger remoteLogger = null;

try {
while (!closed) {
// read an event from the wire
event = (ILoggingEvent) hardenedLoggingEventInputStream.readObject();
// get a logger from the hierarchy. The name of the logger is taken to
// be the name contained in the event.
remoteLogger = context.getLogger(event.getLoggerName());

if (serverAppender != null) {
// if a server appender is specified, use it
remoteLogger = context.getLogger(serverAppender);
}

if (remoteLogger == null) {
// get a logger from the hierarchy. The name of the logger is taken to
// be the name contained in the event.
remoteLogger = context.getLogger(event.getLoggerName());
}

// apply the logger-level filter
if (remoteLogger.isEnabledFor(event.getLevel())) {
// finally log the event as if was generated locally
Expand Down