Arma3_Exile/arma-server-web-admin
1
0
Fork 0
mirror of https://github.com/Dahlgren/arma-server-web-admin.git synced 2024-08-30 17:22:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove global config variable from server file

Browse Source
This commit is contained in:
Björn Dahlgren 2021-07-10 15:38:50 +02:00
parent 931e913a3e
commit 3c56bba515
1 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
lib/server.js
View File

@ -5,8 +5,6 @@ var slugify = require('slugify')
var ArmaServer = require('arma-server') var ArmaServer = require('arma-server')
var config = require('../config.js')
var queryInterval = 5000 var queryInterval = 5000
var queryTypes = { var queryTypes = {
arma1: 'arma', arma1: 'arma',
@ -19,18 +17,6 @@ var queryTypes = {
ofpresistance: 'operationflashpoint' ofpresistance: 'operationflashpoint'
} }
var createServerTitle = function (title) {
if (config.prefix) {
title = config.prefix + title
}
if (config.suffix) {
title = title + config.suffix
}
return title
}
var Server = function (config, logs, options) { var Server = function (config, logs, options) {
this.config = config this.config = config
this.logs = logs this.logs = logs
@ -39,6 +25,18 @@ var Server = function (config, logs, options) {
Server.prototype = new events.EventEmitter() Server.prototype = new events.EventEmitter()
Server.prototype.createServerTitle = function (title) {
if (this.config.prefix) {
title = this.config.prefix + title
}
if (this.config.suffix) {
title = title + this.config.suffix
}
return title
}
Server.prototype.generateId = function () { Server.prototype.generateId = function () {
return slugify(this.title).replace(/\./g, '-') return slugify(this.title).replace(/\./g, '-')
} }
@ -76,7 +74,7 @@ Server.prototype.queryStatus = function () {
var self = this var self = this
Gamedig.query( Gamedig.query(
{ {
type: queryTypes[config.game], type: queryTypes[this.config.game],
host: '127.0.0.1', host: '127.0.0.1',
port: self.port port: self.port
}, },
@ -100,8 +98,8 @@ Server.prototype.queryStatus = function () {
Server.prototype.getParameters = function () { Server.prototype.getParameters = function () {
var parameters = [] var parameters = []
if (config.parameters && Array.isArray(config.parameters)) { if (this.config.parameters && Array.isArray(this.config.parameters)) {
parameters = parameters.concat(config.parameters) parameters = parameters.concat(this.config.parameters)
} }
if (this.parameters && Array.isArray(this.parameters)) { if (this.parameters && Array.isArray(this.parameters)) {
@ -114,8 +112,8 @@ Server.prototype.getParameters = function () {
Server.prototype.getAdditionalConfigurationOptions = function () { Server.prototype.getAdditionalConfigurationOptions = function () {
var additionalConfigurationOptions = '' var additionalConfigurationOptions = ''
if (config.additionalConfigurationOptions) { if (this.config.additionalConfigurationOptions) {
additionalConfigurationOptions += config.additionalConfigurationOptions additionalConfigurationOptions += this.config.additionalConfigurationOptions
} }
if (this.additionalConfigurationOptions) { if (this.additionalConfigurationOptions) {
@ -137,16 +135,16 @@ Server.prototype.start = function () {
var parameters = this.getParameters() var parameters = this.getParameters()
var server = new ArmaServer.Server({ var server = new ArmaServer.Server({
additionalConfigurationOptions: this.getAdditionalConfigurationOptions(), additionalConfigurationOptions: this.getAdditionalConfigurationOptions(),
admins: config.admins, admins: this.config.admins,
allowedFilePatching: this.allowed_file_patching || 1, allowedFilePatching: this.allowed_file_patching || 1,
battleEye: this.battle_eye ? 1 : 0, battleEye: this.battle_eye ? 1 : 0,
config: this.id, config: this.id,
disableVoN: this.von ? 0 : 1, disableVoN: this.von ? 0 : 1,
game: config.game, game: this.config.game,
filePatching: this.file_patching || false, filePatching: this.file_patching || false,
forcedDifficulty: this.forcedDifficulty || null, forcedDifficulty: this.forcedDifficulty || null,
headlessClients: this.number_of_headless_clients > 0 ? ['127.0.0.1'] : null, headlessClients: this.number_of_headless_clients > 0 ? ['127.0.0.1'] : null,
hostname: createServerTitle(this.title), hostname: this.createServerTitle(this.title),
localClient: this.number_of_headless_clients > 0 ? ['127.0.0.1'] : null, localClient: this.number_of_headless_clients > 0 ? ['127.0.0.1'] : null,
missions: this.missions, missions: this.missions,
mods: this.mods, mods: this.mods,
@ -159,7 +157,7 @@ Server.prototype.start = function () {
platform: this.config.type, platform: this.config.type,
players: this.max_players, players: this.max_players,
port: this.port, port: this.port,
serverMods: config.serverMods, serverMods: this.config.serverMods,
verifySignatures: this.verify_signatures ? 2 : 0 verifySignatures: this.verify_signatures ? 2 : 0
}) })
server.writeServerConfig() server.writeServerConfig()
@ -204,7 +202,7 @@ Server.prototype.startHeadlessClients = function () {
var headlessClientInstances = _.times(this.number_of_headless_clients, function (i) { var headlessClientInstances = _.times(this.number_of_headless_clients, function (i) {
var headless = new ArmaServer.Headless({ var headless = new ArmaServer.Headless({
filePatching: self.file_patching, filePatching: self.file_patching,
game: config.game, game: self.config.game,
host: '127.0.0.1', host: '127.0.0.1',
mods: self.mods, mods: self.mods,
parameters: parameters, parameters: parameters,