X-Git-Url: https://git.pterodactylus.net/?p=sonitus.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsonitus%2Fdata%2FPipeline.java;h=ab6500e01ef6dc5bae315903b634a06a569511f2;hp=66ee2e54df787b6bcf189e9e3c5955861d6b76d5;hb=f260375da81abdf84e48545a505be6014e75978a;hpb=2503d1e00696c7f4de94482c05b0faea582f42cc diff --git a/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java b/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java index 66ee2e5..ab6500e 100644 --- a/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java +++ b/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java @@ -167,13 +167,15 @@ public class Pipeline implements Iterable { } } for (Connection connection : connections) { - logger.info(String.format("Starting Connection from %s to %s.", connection.source.name(), FluentIterable.from(connection.sinks).transform(new Function() { + String threadName = String.format("%s → %s.", connection.source.name(), FluentIterable.from(connection.sinks).transform(new Function() { + @Override public String apply(Sink sink) { return sink.name(); } - }))); - new Thread(connection).start(); + })); + logger.info(String.format("Starting Thread: %s", threadName)); + new Thread(connection, threadName).start(); } } @@ -398,11 +400,11 @@ public class Pipeline implements Iterable { try { final byte[] buffer; try { - logger.finest(String.format("Getting %d bytes from %s...", 4096, source)); + logger.finest(String.format("Getting %d bytes from %s...", 4096, source.name())); buffer = source.get(4096); - logger.finest(String.format("Got %d bytes from %s.", buffer.length, source)); + logger.finest(String.format("Got %d bytes from %s.", buffer.length, source.name())); } catch (IOException ioe1) { - throw new IOException(String.format("I/O error while reading from %s.", source), ioe1); + throw new IOException(String.format("I/O error while reading from %s.", source.name()), ioe1); } List> futures = executorService.invokeAll(FluentIterable.from(sinks).transform(new Function>() { @@ -413,11 +415,11 @@ public class Pipeline implements Iterable { @Override public Void call() throws Exception { try { - logger.finest(String.format("Sending %d bytes to %s.", buffer.length, sink)); + logger.finest(String.format("Sending %d bytes to %s.", buffer.length, sink.name())); sink.process(buffer); - logger.finest(String.format("Sent %d bytes to %s.", buffer.length, sink)); + logger.finest(String.format("Sent %d bytes to %s.", buffer.length, sink.name())); } catch (IOException ioe1) { - throw new IOException(String.format("I/O error while writing to %s", sink), ioe1); + throw new IOException(String.format("I/O error while writing to %s", sink.name()), ioe1); } return null; }