Improve logging.

[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 ee67eec..ae4158d 100644 (file)
--- a/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/Pipeline.java
@@ -34,8 +34,8 @@ import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.FluentIterable;
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMultimap;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.common.util.concurrent.MoreExecutors;
@@ -71,6 +71,21 @@ public class Pipeline implements Iterable<ControlledComponent> {
        private Pipeline(Source source, Multimap<Source, Sink> sinks) {
                this.source = Preconditions.checkNotNull(source, "source must not be null");
                this.sinks = Preconditions.checkNotNull(sinks, "sinks must not be null");
+               for (ControlledComponent component : Lists.reverse(components())) {
+                       logger.finest(String.format("Adding Listener to %s.", component.name()));
+                       component.addMetadataListener(new MetadataListener() {
+                               @Override
+                               public void metadataUpdated(ControlledComponent component, Metadata metadata) {
+                                       if (!(component instanceof Source)) {
+                                               return;
+                                       }
+                                       for (ControlledComponent controlledComponent : sinks((Source) component)) {
+                                               logger.fine(String.format("Updating Metadata from %s to %s as %s.", component.name(), controlledComponent.name(), metadata));
+                                               controlledComponent.metadataUpdated(metadata);
+                                       }
+                               }
+                       });
+               }
        }
 
        //
@@ -144,6 +159,7 @@ public class Pipeline implements Iterable<ControlledComponent> {
                        Collection<Sink> sinks = this.sinks.get(source);
                        connections.add(new Connection(source, sinks));
                        for (Sink sink : sinks) {
+                               logger.info(String.format("Opening %s with %s...", sink.name(), source.metadata()));
                                sink.open(source.metadata());
                                if (sink instanceof Filter) {
                                        sources.add((Source) sink);
@@ -151,7 +167,12 @@ public class Pipeline implements Iterable<ControlledComponent> {
                        }
                }
                for (Connection connection : connections) {
-                       logger.info(String.format("Starting Connection from %s to %s.", connection.source, connection.sinks));
+                       logger.info(String.format("Starting Connection from %s to %s.", connection.source.name(), FluentIterable.from(connection.sinks).transform(new Function<Sink, String>() {
+                               @Override
+                               public String apply(Sink sink) {
+                                       return sink.name();
+                               }
+                       })));
                        new Thread(connection).start();
                }
        }
@@ -172,7 +193,34 @@ public class Pipeline implements Iterable<ControlledComponent> {
 
        @Override
        public Iterator<ControlledComponent> iterator() {
-               return ImmutableSet.<ControlledComponent>builder().add(source).addAll(sinks.values()).build().iterator();
+               return components().iterator();
+       }
+
+       //
+       // PRIVATE METHODS
+       //
+
+       /**
+        * Returns all components of this pipeline, listed breadth-first, starting with
+        * the source.
+        *
+        * @return All components of this pipeline
+        */
+       public List<ControlledComponent> components() {
+               ImmutableList.Builder<ControlledComponent> components = ImmutableList.builder();
+               List<ControlledComponent> currentComponents = Lists.newArrayList();
+               components.add(source);
+               currentComponents.add(source);
+               while (!currentComponents.isEmpty()) {
+                       Collection<Sink> sinks = this.sinks((Source) currentComponents.remove(0));
+                       for (Sink sink : sinks) {
+                               components.add(sink);
+                               if (sink instanceof Source) {
+                                       currentComponents.add(sink);
+                               }
+                       }
+               }
+               return components.build();
        }
 
        //
@@ -335,8 +383,6 @@ public class Pipeline implements Iterable<ControlledComponent> {
                        Metadata firstMetadata = null;
                        while (!stopped.get()) {
                                try {
-                                       final Metadata lastMetadata = firstMetadata;
-                                       final Metadata metadata = firstMetadata = source.metadata();
                                        final byte[] buffer;
                                        try {
                                                logger.finest(String.format("Getting %d bytes from %s...", 4096, source));
@@ -353,9 +399,6 @@ public class Pipeline implements Iterable<ControlledComponent> {
 
                                                                @Override
                                                                public Void call() throws Exception {
-                                                                       if (!metadata.equals(lastMetadata)) {
-                                                                               sink.metadataUpdated(metadata);
-                                                                       }
                                                                        try {
                                                                                logger.finest(String.format("Sending %d bytes to %s.", buffer.length, sink));
                                                                                sink.process(buffer);