Let the connection use its own logger.

[sonitus.git] / src / main / java / net / pterodactylus / sonitus / data / Pipeline.java

diff --git a/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java b/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java
index 46d2374..1fcec19 100644 (file)
--- a/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java
@@ -138,15 +138,16 @@ public class Pipeline implements Iterable<Filter> {
                }
                List<Filter> filters = Lists.newArrayList();
                filters.add(source);
-               source.open(Metadata.UNKNOWN);
+               Metadata currentMetadata = Metadata.UNKNOWN;
                /* collect all source->sink pairs. */
                while (!filters.isEmpty()) {
                        Filter filter = filters.remove(0);
+                       logger.info(String.format("Opening %s with %s...", filter.name(), currentMetadata));
+                       filter.open(currentMetadata);
+                       currentMetadata = filter.metadata();
                        Collection<Filter> sinks = this.filters.get(filter);
                        connections.add(new Connection(filter, sinks));
                        for (Filter sink : sinks) {
-                               logger.info(String.format("Opening %s with %s...", sink.name(), source.metadata()));
-                               sink.open(filter.metadata());
                                filters.add(sink);
                        }
                }
@@ -296,7 +297,10 @@ public class Pipeline implements Iterable<Filter> {
         *
         * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
         */
-       public class Connection implements Runnable {
+       public static class Connection implements Runnable {
+
+               /** The logger. */
+               private static final Logger logger = Logger.getLogger(Connection.class.getName());
 
                /** The source. */
                private final Filter source;
@@ -316,6 +320,9 @@ public class Pipeline implements Iterable<Filter> {
                /** The number of copied bytes. */
                private long counter;
 
+               /** The exception that was encountered, if any. */
+               private Optional<IOException> ioException = Optional.absent();
+
                /**
                 * Creates a new connection.
                 *
@@ -339,6 +346,24 @@ public class Pipeline implements Iterable<Filter> {
                //
 
                /**
+                * Returns the source of this connection.
+                *
+                * @return The source of this connection
+                */
+               public Filter source() {
+                       return source;
+               }
+
+               /**
+                * Returns the sinks of this connection.
+                *
+                * @return The sinks of this connection
+                */
+               public Collection<Filter> sinks() {
+                       return sinks;
+               }
+
+               /**
                 * Returns the time this connection was started.
                 *
                 * @return The time this connection was started (in milliseconds since Jan 1,
@@ -358,6 +383,17 @@ public class Pipeline implements Iterable<Filter> {
                        return counter;
                }
 
+               /**
+                * Returns the I/O exception that was encountered while processing this
+                * connection.
+                *
+                * @return The I/O exception that occured, or {@link Optional#absent()} if no
+                *         exception occured
+                */
+               public Optional<IOException> ioException() {
+                       return ioException;
+               }
+
                //
                // ACTIONS
                //
@@ -377,13 +413,9 @@ public class Pipeline implements Iterable<Filter> {
                        while (!stopped.get()) {
                                try {
                                        final DataPacket dataPacket;
-                                       try {
-                                               logger.finest(String.format("Getting %d bytes from %s...", 4096, source.name()));
-                                               dataPacket = source.get(4096);
-                                               logger.finest(String.format("Got %d bytes from %s.", dataPacket.buffer().length, source.name()));
-                                       } catch (IOException ioe1) {
-                                               throw new IOException(String.format("I/O error while reading from %s.", source.name()), ioe1);
-                                       }
+                                       logger.finest(String.format("Getting %d bytes from %s...", 4096, source.name()));
+                                       dataPacket = source.get(4096);
+                                       logger.finest(String.format("Got %d bytes from %s.", dataPacket.buffer().length, source.name()));
                                        List<Future<Void>> futures = executorService.invokeAll(FluentIterable.from(sinks).transform(new Function<Filter, Callable<Void>>() {
 
                                                @Override
@@ -392,13 +424,9 @@ public class Pipeline implements Iterable<Filter> {
 
                                                                @Override
                                                                public Void call() throws Exception {
-                                                                       try {
-                                                                               logger.finest(String.format("Sending %d bytes to %s.", dataPacket.buffer().length, sink.name()));
-                                                                               sink.process(dataPacket);
-                                                                               logger.finest(String.format("Sent %d bytes to %s.", dataPacket.buffer().length, sink.name()));
-                                                                       } catch (IOException ioe1) {
-                                                                               throw new IOException(String.format("I/O error while writing to %s", sink.name()), ioe1);
-                                                                       }
+                                                                       logger.finest(String.format("Sending %d bytes to %s.", dataPacket.buffer().length, sink.name()));
+                                                                       sink.process(dataPacket);
+                                                                       logger.finest(String.format("Sent %d bytes to %s.", dataPacket.buffer().length, sink.name()));
                                                                        return null;
                                                                }
                                                        };
@@ -410,8 +438,7 @@ public class Pipeline implements Iterable<Filter> {
                                        }
                                        counter += dataPacket.buffer().length;
                                } catch (IOException e) {
-                                       /* TODO */
-                                       e.printStackTrace();
+                                       ioException = Optional.of(e);
                                        break;
                                } catch (InterruptedException e) {
                                        /* TODO */