From ba98c1920ec85195e7f178a3476097954ac65341 Mon Sep 17 00:00:00 2001
From: pm47 <spam4420@gmail.com>
Date: Mon, 25 Jan 2016 20:03:44 +0100
Subject: [PATCH 1/2] fixed client init

---
 eclair-demo/src/main/scala/fr/acinq/eclair/io/Client.scala | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclair-demo/src/main/scala/fr/acinq/eclair/io/Client.scala b/eclair-demo/src/main/scala/fr/acinq/eclair/io/Client.scala
index 77574560c..8ac7f77ba 100644
--- a/eclair-demo/src/main/scala/fr/acinq/eclair/io/Client.scala
+++ b/eclair-demo/src/main/scala/fr/acinq/eclair/io/Client.scala
@@ -23,7 +23,7 @@ class Client(remote: InetSocketAddress) extends Actor with ActorLogging {
     case c@Connected(remote, local) =>
       log.info(s"connected to $remote")
       val connection = sender()
-      val handler = context.actorOf(Props(classOf[AuthHandler], Boot.blockchain, connection))
+      val handler = context.actorOf(Props(classOf[AuthHandler], connection, Boot.blockchain, true))
       connection ! Register(handler)
   }
 }

From 0b830a6b10a6f29d6d3814d69fe89d3ea1fd9e10 Mon Sep 17 00:00:00 2001
From: pm47 <spam4420@gmail.com>
Date: Mon, 25 Jan 2016 20:07:25 +0100
Subject: [PATCH 2/2] simplified logging

---
 eclair-demo/src/main/resources/logback.xml | 24 ++++------------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/eclair-demo/src/main/resources/logback.xml b/eclair-demo/src/main/resources/logback.xml
index 046be2cc4..1bc8b14da 100644
--- a/eclair-demo/src/main/resources/logback.xml
+++ b/eclair-demo/src/main/resources/logback.xml
@@ -16,12 +16,12 @@
         </encoder>
     </appender>
 
-    <appender name="ALICE" class="ch.qos.logback.core.ConsoleAppender">
+    <appender name="CHANNEL" class="ch.qos.logback.core.ConsoleAppender">
         <target>System.out</target>
         <withJansi>false</withJansi>
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
             <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
-                <expression>return ((String) mdc.get("akkaSource")).contains("alice");</expression>
+                <expression>return logger.contains("Channel");</expression>
             </evaluator>
             <OnMismatch>DENY</OnMismatch>
             <OnMatch>ACCEPT</OnMatch>
@@ -31,27 +31,12 @@
         </encoder>
     </appender>
 
-    <appender name="BOB" class="ch.qos.logback.core.ConsoleAppender">
-        <target>System.out</target>
-        <withJansi>false</withJansi>
-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
-                <expression>return ((String) mdc.get("akkaSource")).contains("bob");</expression>
-            </evaluator>
-            <OnMismatch>DENY</OnMismatch>
-            <OnMatch>ACCEPT</OnMatch>
-        </filter>
-        <encoder>
-            <pattern>%yellow(${HOSTNAME} %d) %highlight(%-5level) %logger{36} %X{akkaSource} - %red(%msg) %ex{12}%n</pattern>
-        </encoder>
-    </appender>
-
     <appender name="BLOCKCHAIN" class="ch.qos.logback.core.ConsoleAppender">
         <target>System.out</target>
         <withJansi>false</withJansi>
         <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
             <evaluator> <!-- defaults to type ch.qos.logback.classic.boolex.JaninoEventEvaluator -->
-                <expression>return ((String) mdc.get("akkaSource")).contains("blockchain");</expression>
+                <expression>return logger.contains("PollingWatcher");</expression>
             </evaluator>
             <OnMismatch>DENY</OnMismatch>
             <OnMatch>ACCEPT</OnMatch>
@@ -62,8 +47,7 @@
     </appender>
 
     <root level="DEBUG">
-        <appender-ref ref="ALICE"/>
-        <appender-ref ref="BOB"/>
+        <appender-ref ref="CHANNEL"/>
         <appender-ref ref="BLOCKCHAIN"/>
         <appender-ref ref="CONSOLE"/>
     </root>