PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-07-12 23:14:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

turning kamon back on

Browse source
This commit is contained in:
FateJH 2020-05-26 19:52:14 -04:00
parent 6f4eac9e43
commit 838493e4bb
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
build.sbt
View file

@ -45,8 +45,8 @@ lazy val commonSettings = Seq(
"com.github.t3hnar" %% "scala-bcrypt" % "4.1", "com.github.t3hnar" %% "scala-bcrypt" % "4.1",
"org.ini4j" % "ini4j" % "0.5.4", "org.ini4j" % "ini4j" % "0.5.4",
"org.scala-graph" %% "graph-core" % "1.13.1", "org.scala-graph" %% "graph-core" % "1.13.1",
// "io.kamon" %% "kamon-bundle" % "2.1.0", "io.kamon" %% "kamon-bundle" % "2.1.0",
// "io.kamon" %% "kamon-apm-reporter" % "2.1.0", "io.kamon" %% "kamon-apm-reporter" % "2.1.0",
"org.json4s" %% "json4s-native" % "3.6.8", "org.json4s" %% "json4s-native" % "3.6.8",
"com.typesafe.akka" %% "akka-stream" % "2.6.5", "com.typesafe.akka" %% "akka-stream" % "2.6.5",
), ),

2
project/plugins.sbt
View file

@ -2,6 +2,6 @@ logLevel := Level.Warn
addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.12") addSbtPlugin("org.xerial.sbt" % "sbt-pack" % "0.12")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
//addSbtPlugin("io.kamon" % "sbt-kanela-runner" % "2.0.6") addSbtPlugin("io.kamon" % "sbt-kanela-runner" % "2.0.6")
// https://github.com/sbt/sbt-unidoc // https://github.com/sbt/sbt-unidoc
//addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2") //addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.2")

4
pslogin/src/main/scala/PsLogin.scala
View file

@ -30,7 +30,7 @@ import scala.collection.JavaConverters._
import scala.concurrent.Await import scala.concurrent.Await
import scala.concurrent.duration._ import scala.concurrent.duration._
//import kamon.Kamon import kamon.Kamon
object PsLogin { object PsLogin {
private val logger = org.log4s.getLogger private val logger = org.log4s.getLogger
@ -217,7 +217,7 @@ object PsLogin {
case true => case true =>
logger.info("Starting Kamon") logger.info("Starting Kamon")
//Kamon.init() Kamon.init()
case _ => ; case _ => ;
} }