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

Create PSForever config framework (#283)

Browse source 
We can now parse arbitrary INI configuration entries. This will allow
server customization and testing without recompiling the server.
This commit is contained in:
pschord 2019-10-21 14:12:26 -04:00 • committed by GitHub
parent 4b71d76cb2
commit c3d19b5377
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 647 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11,6 +11,7 @@ import ch.qos.logback.core.joran.spi.JoranException
import ch.qos.logback.core.status._
import ch.qos.logback.core.util.StatusPrinter
import com.typesafe.config.ConfigFactory
import net.psforever.config.{Valid, Invalid}
import net.psforever.crypto.CryptoInterface
import net.psforever.objects.zones._
import net.psforever.objects.guid.TaskResolver
@ -102,6 +103,33 @@ object PsLogin {
}
}
def loadConfig(configDirectory : String) = {
val worldConfigFile = configDirectory + File.separator + "worldserver.ini"
// For fallback when no user-specific config file has been created
val worldDefaultConfigFile = configDirectory + File.separator + "worldserver.ini.dist"
val worldConfigToLoad = if ((new File(worldConfigFile)).exists()) {
worldConfigFile
} else if ((new File(worldDefaultConfigFile)).exists()) {
println("WARNING: loading the default worldserver.ini.dist config file")
println("WARNING: Please create a worldserver.ini file to override server defaults")
worldDefaultConfigFile
} else {
println("FATAL: unable to load any worldserver.ini file")
sys.exit(1)
}
WorldConfig.Load(worldConfigToLoad) match {
case Valid =>
println("Loaded world config from " + worldConfigFile)
case i : Invalid =>
println("FATAL: Error loading config from " + worldConfigFile)
println(WorldConfig.FormatErrors(i).mkString("\n"))
sys.exit(1)
}
}
def parseArgs(args : Array[String]) : Unit = {
if(args.length == 1) {
LoginConfig.serverIpAddress = InetAddress.getByName(args{0})
@ -125,9 +153,15 @@ object PsLogin {
configDirectory = System.getProperty("prog.home") + File.separator + "config"
}
initializeLogging(configDirectory + File.separator + "logback.xml")
parseArgs(this.args)
val loggingConfigFile = configDirectory + File.separator + "logback.xml"
loadConfig(configDirectory)
println(s"Initializing logging from ${loggingConfigFile}...")
initializeLogging(loggingConfigFile)
/** Initialize the PSCrypto native library
*
* PSCrypto provides PlanetSide specific crypto that is required to communicate with it.
@ -194,9 +228,8 @@ object PsLogin {
SessionPipeline("world-session-", Props[WorldSessionActor])
)
val loginServerPort = 51000
val worldServerPort = 51001
val loginServerPort = WorldConfig.Get[Int]("loginserver.ListeningPort")
val worldServerPort = WorldConfig.Get[Int]("worldserver.ListeningPort")
// Uncomment for network simulation
// TODO: make this config or command flag

28
pslogin/src/main/scala/WorldConfig.scala Normal file
View file

@ -0,0 +1,28 @@
// Copyright (c) 2019 PSForever
import net.psforever.config._
object WorldConfig extends ConfigParser {
protected var config_map : Map[String, Any] = Map()
protected val config_template = Seq(
ConfigSection("loginserver",
ConfigEntryInt("ListeningPort", 51000, Constraints.min(1), Constraints.max(65535))
),
ConfigSection("worldserver",
ConfigEntryInt("ListeningPort", 51001, Constraints.min(1), Constraints.max(65535))
)
)
override def postParseChecks : ValidationResult = {
var errors : Invalid = Invalid("")
if (Get[Int]("worldserver.ListeningPort") == Get[Int]("loginserver.ListeningPort"))
errors = errors ++ Invalid("worldserver.ListeningPort must be different from loginserver.ListeningPort")
if (errors.errors.length > 1)
// drop the first error using tail (it was a placeholder)
Invalid(errors.errors.tail)
else
Valid
}
}