server: Fix server getting wedged after map query with bad minimap
If the mapserver returned an unusable minimap blob, we'd end up dropping the resulting exceptions on the floor, and committing a completely broken MapPreview, which would then blow up the tail end of the map change process, and all future ValidateClient calls after players join (which itself was handled by kicking the player and logging some noise of dubious value). Adjusts exception handling in a number of places to log the exception rather than dropping it on the floor, and makes the mapserver response parsing tolerant of bogus minimap blobs -- in this case, we'd rather just have no minimap. Candidate for stable, as it fixes a bug present in the current release and the current playtest series. Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
This commit is contained in:
@@ -150,9 +150,10 @@ namespace OpenRA
|
||||
foreach (var kv in yaml)
|
||||
maps[kv.Key].UpdateRemoteSearch(MapStatus.DownloadAvailable, kv.Value, mapDetailsReceived);
|
||||
}
|
||||
catch
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Write("debug", "Can't parse remote map search data:\n{0}", data);
|
||||
Log.Write("debug", "Exception: {0}", e);
|
||||
if (queryFailed != null)
|
||||
queryFailed();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user