1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-02-23 14:40:34 +01:00

merged from master

This commit is contained in:
pm47 2016-01-26 09:05:13 +01:00
commit 25273d539f
2 changed files with 34 additions and 2 deletions

View file

@ -9,7 +9,39 @@
</encoder> </encoder>
</appender> </appender>
<root level="INFO"> <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 logger.contains("Channel");</expression>
</evaluator>
<OnMismatch>DENY</OnMismatch>
<OnMatch>ACCEPT</OnMatch>
</filter>
<encoder>
<pattern>%yellow(${HOSTNAME} %d) %highlight(%-5level) %logger{36} %X{akkaSource} - %blue(%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 logger.contains("PollingWatcher");</expression>
</evaluator>
<OnMismatch>DENY</OnMismatch>
<OnMatch>ACCEPT</OnMatch>
</filter>
<encoder>
<pattern>%yellow(${HOSTNAME} %d) %highlight(%-5level) %logger{36} %X{akkaSource} - %boldGreen(%msg) %ex{12}%n</pattern>
</encoder>
</appender>
<root level="DEBUG">
<appender-ref ref="CHANNEL"/>
<appender-ref ref="BLOCKCHAIN"/>
<appender-ref ref="CONSOLE"/> <appender-ref ref="CONSOLE"/>
</root> </root>

View file

@ -23,7 +23,7 @@ class Client(remote: InetSocketAddress) extends Actor with ActorLogging {
case c@Connected(remote, local) => case c@Connected(remote, local) =>
log.info(s"connected to $remote") log.info(s"connected to $remote")
val connection = sender() 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) connection ! Register(handler)
} }
} }