PSForever/PSF-BotServer
1
0
Fork 0
mirror of https://github.com/2revoemag/PSF-BotServer.git synced 2026-01-19 18:14:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix logback debug file and bump version

Browse source
This commit is contained in:
Chord 2016-07-29 02:42:10 -04:00
parent 44c5f65796
commit 6c86ac92a7
3 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build.sbt
View file

@ -1,7 +1,7 @@
lazy val commonSettings = Seq(
organization := "net.psforever",
version := "1.0",
scalaVersion := "2.11.7",
version := "1.0.1-SNAPSHOT",
scalaVersion := "2.11.8",
scalacOptions := Seq("-unchecked", "-deprecation", "-encoding", "utf8"),
resolvers += "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
libraryDependencies ++= Seq(

25
config/logback.xml
View file

@ -7,21 +7,34 @@
<encoder>
<pattern>[%highlight(%5level)] %logger{35} - %msg%n</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>INFO</level>
</filter>
</appender>
<appender name="FILE" class="ch.qos.logback.core.FileAppender">
<appender name="FILE-TRACE" class="ch.qos.logback.core.FileAppender">
<file>pslogin-trace.log</file>
<encoder>
<pattern>%date{ISO8601} [%thread] %-5level %X %logger{35} - %msg%n</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>TRACE</level>
</filter>
</appender>
<appender name="FILE-DEBUG" class="ch.qos.logback.core.FileAppender">
<file>pslogin-debug.log</file>
<encoder>
<!--<pattern>%date{ISO8601} %highlight(%-5level) [%thread MDC{%X}] %logger{35} - %msg%n</pattern>-->
<pattern>%date{ISO8601} %-5level %X %logger{35} - %msg%n</pattern>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
<level>DEBUG</level>
</filter>
</appender>
<root level="INFO">
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE-TRACE" />
<appender-ref ref="FILE-DEBUG" />
</root>
<logger name="debug-logger" level="DEBUG">
<appender-ref ref="FILE" />
</logger>
</configuration>

8
pslogin/src/main/scala/CryptoSessionActor.scala
View file

@ -83,13 +83,12 @@ class CryptoSessionActor extends Actor with MDCContextAware {
def CryptoExchange : Receive = {
case RawPacket(msg) =>
PacketCoding.UnmarshalPacket(msg, CryptoPacketOpcode.ClientChallengeXchg) match {
case Failure(e) => log.error("Could not decode packet: " + e)
case Failure(e) => log.error("Could not decode packet in state CryptoExchange: " + e)
case Successful(p) =>
log.trace("NewClient -> CryptoExchange")
p match {
case CryptoPacket(seq, ClientChallengeXchg(time, challenge, p, g)) =>
cryptoDHState = Some(new CryptoInterface.CryptoDHState())
val dh = cryptoDHState.get
@ -127,7 +126,7 @@ class CryptoSessionActor extends Actor with MDCContextAware {
def CryptoSetupFinishing : Receive = {
case RawPacket(msg) =>
PacketCoding.UnmarshalPacket(msg, CryptoPacketOpcode.ClientFinished) match {
case Failure(e) => log.error("Could not decode packet: " + e)
case Failure(e) => log.error("Could not decode packet in state CryptoSetupFinishing: " + e)
case Successful(p) =>
log.trace("CryptoExchange -> CryptoSetupFinishing")
@ -222,11 +221,8 @@ class CryptoSessionActor extends Actor with MDCContextAware {
case Successful(p) =>
p match {
case encPacket @ EncryptedPacket(seq, _) =>
//println("Decrypting packet..." + encPacket)
PacketCoding.decryptPacket(cryptoState.get, encPacket) match {
case Successful(packet) =>
//println("RECV[E]: " + packet)
self ! packet
case Failure(e) =>
log.error("Failed to decode encrypted packet: " + e)