Resolve merge conflicts

jmarin · jmarin · commit 97107b6af320 · 2017-08-28T09:59:15.000-04:00
diff --git a/README.md b/README.md
@@ -213,6 +213,9 @@ docker run -d -p "8080:8080 -p 8082:8082" hmda-api
 The Filing API will run on `$(docker-machine ip):8080`
 The Public API will run on `$(docker-machine ip):8082`
 
+By default, the `HDMA Platform` runs with a log level of `INFO`. This can be changed by establishing a different log level in the `HMDA_LOGLEVEL` environment variable.
+For the different logging options, see the [reference.conf](https://github.com/akka/akka/blob/master/akka-actor/src/main/resources/reference.conf#L38) default configuration file for `Akka`. 
+
 #### To run the entire platform
 
 1. Ensure you have a Docker Machine with sufficient resources, as described in the [Docker](#docker) section above.
diff --git a/api/src/main/resources/application-dev.conf b/api/src/main/resources/application-dev.conf
@@ -1,6 +1,7 @@
 akka {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
+  loglevel = ${?HMDA_LOGLEVEL}
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
   http.parsing.max-content-length = 1G
   http.server.default-host-header = "cfpb.gov"
diff --git a/api/src/main/resources/application.conf b/api/src/main/resources/application.conf
@@ -1,6 +1,7 @@
 akka {
   loggers = ["akka.event.slf4j.Slf4jLogger"]
   loglevel = "INFO"
+  loglevel = ${?HMDA_LOGLEVEL}
   logging-filter = "akka.event.slf4j.Slf4jLoggingFilter"
   http.parsing.max-content-length = 1G
   http.server.default-host-header = "cfpb.gov"
diff --git a/api/src/main/resources/logback.xml b/api/src/main/resources/logback.xml
@@ -18,5 +18,6 @@
   <logger name="com.zaxxer.hikari" level="INFO" />
   <logger name="com.datastax.driver" level="INFO" />
   <logger name="org.apache.zookeeper" level="WARN" />
+  <logger name="de.heikoseeberger.constructr" level="INFO"/>
 
 </configuration>
diff --git a/cluster/src/main/resources/logback.xml b/cluster/src/main/resources/logback.xml
@@ -18,5 +18,6 @@
   <logger name="com.zaxxer.hikari" level="INFO" />
   <logger name="com.datastax.driver" level="INFO" />
   <logger name="org.apache.zookeeper" level="WARN" />
+  <logger name="de.heikoseeberger.constructr" level="WARN" />
 
 </configuration>
diff --git a/cluster/src/main/scala/hmda/cluster/HmdaPlatform.scala b/cluster/src/main/scala/hmda/cluster/HmdaPlatform.scala
@@ -34,6 +34,20 @@ import hmda.util.FutureRetry.retry
 object HmdaPlatform extends App {
 
   val log = LoggerFactory.getLogger("hmda")
+
+  log.info(
+    """
+      | #     # #     # ######     #       ######
+      | #     # ##   ## #     #   # #      #     # #        ##   ##### ######  ####  #####  #    #
+      | #     # # # # # #     #  #   #     #     # #       #  #    #   #      #    # #    # ##  ##
+      | ####### #  #  # #     # #     #    ######  #      #    #   #   #####  #    # #    # # ## #
+      | #     # #     # #     # #######    #       #      ######   #   #      #    # #####  #    #
+      | #     # #     # #     # #     #    #       #      #    #   #   #      #    # #   #  #    #
+      | #     # #     # ######  #     #    #       ###### #    #   #   #       ####  #    # #    #
+      |
+      """.stripMargin
+  )
+
   val clusterRoleConfig = sys.env.get("HMDA_CLUSTER_ROLES").map(roles => s"akka.cluster.roles = [$roles]").getOrElse("")
   val clusterConfig = ConfigFactory.parseString(clusterRoleConfig).withFallback(configuration)
   val system = ActorSystem(clusterConfig.getString("clustering.name"), clusterConfig)
diff --git a/panel/src/main/resources/application.conf b/panel/src/main/resources/application.conf
@@ -1,5 +1,6 @@
 akka {
   loglevel = "INFO"
+  loglevel = ${?HMDA_LOGLEVEL}
   actor.warn-about-java-serializer-usage = off
 }
 
diff --git a/persistence-model/src/main/resources/application-dev.conf b/persistence-model/src/main/resources/application-dev.conf
@@ -1,5 +1,6 @@
 akka {
   loglevel = "INFO"
+  loglevel = ${?HMDA_LOGLEVEL}
   actor {
     warn-about-java-serializer-usage = on
     serializers {
diff --git a/persistence-model/src/main/resources/application.conf b/persistence-model/src/main/resources/application.conf
@@ -1,5 +1,6 @@
 akka {
-  loglevel = "DEBUG"
+  loglevel = "INFO"
+  loglevel = ${?HMDA_LOGLEVEL}
   actor {
     warn-about-java-serializer-usage = on
     serializers {
diff --git a/publication/src/main/resources/logback.xml b/publication/src/main/resources/logback.xml
@@ -18,5 +18,6 @@
   <logger name="com.zaxxer.hikari" level="INFO" />
   <logger name="com.datastax.driver" level="INFO" />
   <logger name="org.apache.zookeeper" level="WARN" />
+  <logger name="de.heikoseeberger.constructr" level="INFO"/>
 
 </configuration>
diff --git a/query/src/main/resources/application.conf b/query/src/main/resources/application.conf
@@ -1,5 +1,6 @@
 akka {
   loglevel = "INFO"
+  loglevel = ${?HMDA_LOGLEVEL}
   actor {
     warn-about-java-serializer-usage = on
     serializers {
diff --git a/query/src/main/resources/logback.xml b/query/src/main/resources/logback.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>[%d][%-5level][%thread] %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
+    <appender-ref ref="STDOUT" />
+  </appender>
+
+  <root level="DEBUG">
+    <appender-ref ref="ASYNC" />
+  </root>
+
+  <logger name="slick" level="INFO" />
+  <logger name="com.zaxxer.hikari" level="INFO" />
+  <logger name="com.datastax.driver" level="INFO" />
+  <logger name="org.apache.zookeeper" level="WARN" />
+  <logger name="de.heikoseeberger.constructr" level="INFO"/>
+
+</configuration>
diff --git a/validation/src/main/resources/application.conf b/validation/src/main/resources/application.conf
@@ -1,8 +1,20 @@
 akka {
-  stdout-loglevel = "DEBUG"
-  loglevel = "DEBUG"
+  stdout-loglevel = "OFF"
+  loglevel = "INFO"
+  loglevel = ${?HMDA_LOGLEVEL}
   log-dead-letters = off
   log-dead-letters-during-shutdown = off
+
+  actor {
+    deployment {
+      /validation-stats {
+        dispatcher = validation-dispatcher
+      }
+    }
+    debug {
+      event-stream = off
+    }
+  }
 }
 
 validation-dispatcher {
diff --git a/validation/src/main/resources/logback.xml b/validation/src/main/resources/logback.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>[%d][%-5level][%thread] %msg%n</pattern>
+    </encoder>
+  </appender>
+
+  <appender name="ASYNC" class="ch.qos.logback.classic.AsyncAppender">
+    <appender-ref ref="STDOUT" />
+  </appender>
+
+  <root level="DEBUG">
+    <appender-ref ref="ASYNC" />
+  </root>
+
+  <logger name="slick" level="INFO" />
+  <logger name="com.zaxxer.hikari" level="INFO" />
+  <logger name="com.datastax.driver" level="INFO" />
+  <logger name="org.apache.zookeeper" level="WARN" />
+  <logger name="de.heikoseeberger.constructr" level="INFO"/>
+
+</configuration>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`akka {`
`2`	`2`	`loglevel = "INFO"`
	`3`	`+ loglevel = ${?HMDA_LOGLEVEL}`
`3`	`4`	`actor.warn-about-java-serializer-usage = off`
`4`	`5`	`}`
`5`	`6`