Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

Allow either parser version or parser name to be used in server config block

Browse Source
This commit is contained in:
RaidMax 2022-02-01 18:27:03 -06:00
parent 2ed5e00bcb
commit 261da918c7
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Application/IW4MServer.cs
View File

@ -1086,12 +1086,16 @@ namespace IW4MAdmin
ServerLogger.LogWarning(ex, "Could not resolve hostname or IP for RCon connection {IP}:{Port}", IP, Port); ServerLogger.LogWarning(ex, "Could not resolve hostname or IP for RCon connection {IP}:{Port}", IP, Port);
ResolvedIpEndPoint = new IPEndPoint(IPAddress.Parse(IP), Port); ResolvedIpEndPoint = new IPEndPoint(IPAddress.Parse(IP), Port);
} }
RconParser = Manager.AdditionalRConParsers RconParser = Manager.AdditionalRConParsers
.FirstOrDefault(_parser => _parser.Version == ServerConfig.RConParserVersion); .FirstOrDefault(parser =>
parser.Version == ServerConfig.RConParserVersion ||
parser.Name == ServerConfig.RConParserVersion);
EventParser = Manager.AdditionalEventParsers EventParser = Manager.AdditionalEventParsers
.FirstOrDefault(_parser => _parser.Version == ServerConfig.EventParserVersion); .FirstOrDefault(parser =>
parser.Version == ServerConfig.EventParserVersion ||
parser.Name == ServerConfig.RConParserVersion);
RconParser ??= Manager.AdditionalRConParsers[0]; RconParser ??= Manager.AdditionalRConParsers[0];
EventParser ??= Manager.AdditionalEventParsers[0]; EventParser ??= Manager.AdditionalEventParsers[0];
@ -1108,7 +1112,7 @@ namespace IW4MAdmin
GameName = RconParser.GameName; GameName = RconParser.GameName;
} }
if (version?.Value?.Length != 0) if (version.Value?.Length != 0)
{ {
var matchedRconParser = Manager.AdditionalRConParsers.FirstOrDefault(_parser => _parser.Version == version.Value); var matchedRconParser = Manager.AdditionalRConParsers.FirstOrDefault(_parser => _parser.Version == version.Value);
RconParser.Configuration = matchedRconParser != null ? matchedRconParser.Configuration : RconParser.Configuration; RconParser.Configuration = matchedRconParser != null ? matchedRconParser.Configuration : RconParser.Configuration;

4
SharedLibraryCore/Configuration/ServerConfiguration.cs
View File

@ -147,8 +147,8 @@ namespace SharedLibraryCore.Configuration
} }
_selectedParser = _rconParsers.FirstOrDefault(p => p.Name == parser); _selectedParser = _rconParsers.FirstOrDefault(p => p.Name == parser);
RConParserVersion = _selectedParser?.Version; RConParserVersion = _selectedParser?.Name;
EventParserVersion = _selectedParser?.Version; EventParserVersion = _selectedParser?.Name;
if (index <= 0 || _rconParsers[index].CanGenerateLogPath) if (index <= 0 || _rconParsers[index].CanGenerateLogPath)
{ {