From 61360d97e05273687ac0e6cd987ffac98210d19f Mon Sep 17 00:00:00 2001
From: Mazo <mazo2@hotmail.com>
Date: Mon, 4 May 2020 05:27:41 +0100
Subject: [PATCH] Kamon tweaks (#401)

* Move application.conf to src/main/resources

* Change ClassLoaderLayeringStrategy for Kanela / Kamon to intiialize properly

* Attempt at reducing PTSv3 log spam

* Silence some more logspam

* Disable oshi logging entirely
---
 build.sbt                                              | 3 ++-
 config/logback.xml                                     | 1 +
 pslogin/src/main/{scala => resources}/application.conf | 0
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename pslogin/src/main/{scala => resources}/application.conf (100%)

diff --git a/build.sbt b/build.sbt
index 05d05d2aa..cf2014a8b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -47,7 +47,8 @@ lazy val commonSettings = Seq(
     "org.scala-graph"            %% "graph-core"    % "1.12.5",
     "io.kamon"                   %% "kamon-bundle" % "2.1.0",
     "io.kamon"                   %% "kamon-apm-reporter" % "2.1.0"
-  )
+  ),
+  classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat
 )
 
 lazy val pscryptoSettings = Seq(
diff --git a/config/logback.xml b/config/logback.xml
index aa7b16bfc..dc63568a1 100644
--- a/config/logback.xml
+++ b/config/logback.xml
@@ -39,4 +39,5 @@
 
   <!-- Logger specific overrides -->
   <logger name="com.github.mauricio.async" level="OFF"/>
+  <logger name="oshi" level="OFF"/>
 </configuration>
diff --git a/pslogin/src/main/scala/application.conf b/pslogin/src/main/resources/application.conf
similarity index 100%
rename from pslogin/src/main/scala/application.conf
rename to pslogin/src/main/resources/application.conf