Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/rorschach.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <code@rebertia.com>2015-03-09 10:42:30 +0300
committerChris Rebert <code@rebertia.com>2015-03-09 10:42:30 +0300
commit19dd0696910a2d4b9fd2686201a839b8002a83c8 (patch)
tree7019f603a187ea3746c996f99b0af7cdb17c3fdd
parent03fdb6d4cb6a50f0c73d179dce9a9b54c1000cc2 (diff)
Add squelch-invalid-http-logging config option
-rw-r--r--src/main/resources/application.conf1
-rw-r--r--src/main/scala/com/getbootstrap/rorschach/server/Boot.scala12
-rw-r--r--src/main/scala/com/getbootstrap/rorschach/server/Settings.scala1
3 files changed, 14 insertions, 0 deletions
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
index 16654b1..50f18c6 100644
--- a/src/main/resources/application.conf
+++ b/src/main/resources/application.conf
@@ -22,6 +22,7 @@ spray.can {
rorschach {
default-port = 9090
+ squelch-invalid-http-logging = true
close-bad-pull-requests = on
github-repos-to-watch = ["twbs/bootstrap", "cvrebert/rorschach-test"]
trusted-orgs = [ "twbs" ]
diff --git a/src/main/scala/com/getbootstrap/rorschach/server/Boot.scala b/src/main/scala/com/getbootstrap/rorschach/server/Boot.scala
index 02d701e..a610ebe 100644
--- a/src/main/scala/com/getbootstrap/rorschach/server/Boot.scala
+++ b/src/main/scala/com/getbootstrap/rorschach/server/Boot.scala
@@ -30,11 +30,23 @@ object Boot extends App {
run(argsPort)
+
+ def squelchInvalidHttpLogging() {
+ import org.slf4j.LoggerFactory
+ import ch.qos.logback.classic.{Logger,Level}
+
+ LoggerFactory.getLogger("spray.can.server.HttpServerConnection").asInstanceOf[Logger].setLevel(Level.ERROR)
+ }
+
def run(port: Option[Int]) {
implicit val system = ActorSystem("on-spray-can")
val settings = Settings(system)
// import actorSystem.dispatcher
+ if (settings.SquelchInvalidHttpLogging) {
+ squelchInvalidHttpLogging()
+ }
+
val commenter = system.actorOf(SmallestMailboxPool(3).props(Props(classOf[GitHubPullRequestCommenter])), "gh-pr-commenter")
val prAuditorPool = system.actorOf(SmallestMailboxPool(5).props(Props(classOf[PullRequestEventHandler], commenter)), "pr-auditor-pool")
val webService = system.actorOf(Props(classOf[RorschachActor], prAuditorPool), "rorschach-service")
diff --git a/src/main/scala/com/getbootstrap/rorschach/server/Settings.scala b/src/main/scala/com/getbootstrap/rorschach/server/Settings.scala
index 6db79a1..48afbbd 100644
--- a/src/main/scala/com/getbootstrap/rorschach/server/Settings.scala
+++ b/src/main/scala/com/getbootstrap/rorschach/server/Settings.scala
@@ -17,6 +17,7 @@ class SettingsImpl(config: Config) extends Extension {
val BotPassword: String = config.getString("rorschach.password")
val WebHookSecretKey: ByteString = ByteString(config.getString("rorschach.web-hook-secret-key").utf8Bytes)
val DefaultPort: Int = config.getInt("rorschach.default-port")
+ val SquelchInvalidHttpLogging: Boolean = config.getBoolean("rorschach.squelch-invalid-http-logging")
val CloseBadPullRequests: Boolean = config.getBoolean("rorschach.close-bad-pull-requests")
val TrustedOrganizations: Set[String] = config.getStringList("rorschach.trusted-orgs").asScala.toSet
}