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

implement feedback from issue #91 when sv_running is off

Browse Source 
clean up a trying to abort thread which doesn't actually work with .net core
don't log event tasks cancelled as error, because it's not
This commit is contained in:
RaidMax
2020-01-13 16:51:16 -06:00
parent 639db5d7eb
commit cd387ca08b
7 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Application/RconParsers/BaseRConParser.cs
View File

@ -36,6 +36,7 @@ namespace IW4MAdmin.Application.RconParsers
RConGetInfo = "ÿÿÿÿgetinfo",
RConResponse = "ÿÿÿÿprint",
},
ServerNotRunningResponse = "Server is not running."
};
Configuration.Status.Pattern = @"^ *([0-9]+) +-?([0-9]+) +((?:[A-Z]+|[0-9]+)) +((?:[a-z]|[0-9]){8,32}|(?:[a-z]|[0-9]){8,32}|bot[0-9]+|(?:[0-9]+)) *(.{0,32}) +([0-9]+) +(\d+\.\d+\.\d+.\d+\:-*\d{1,5}|0+.0+:-*\d{1,5}|loopback|unknown) +(-*[0-9]+) +([0-9]+) *$";
@ -141,7 +142,7 @@ namespace IW4MAdmin.Application.RconParsers
if (Status.Length < 4)
{
throw new ServerException("Unexpected status response received");
throw new ServerException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_UNEXPECTED_STATUS"]);
}
int validMatches = 0;
@ -208,7 +209,7 @@ namespace IW4MAdmin.Application.RconParsers
// this happens if status is requested while map is rotating
if (Status.Length > 5 && validMatches == 0)
{
throw new ServerException("Server is rotating map");
throw new ServerException(Utilities.CurrentLocalization.LocalizationIndex["SERVER_ERROR_ROTATING_MAP"]);
}
return StatusPlayers;