OpenCodeBox/fishbait
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added try/catch to transport update loop

Browse source
This commit is contained in:
Derek S 2021-04-08 21:01:49 -05:00
parent b84448ea11
commit 63de39ebf7
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
ServerProject-DONT-IMPORT-INTO-UNITY/LRM/Program/Program.cs
View file

@ -48,7 +48,7 @@ namespace LightReflectiveMirror
WriteLogMessage("Loading Assembly... ", ConsoleColor.White, true); WriteLogMessage("Loading Assembly... ", ConsoleColor.White, true);
try try
{ {
var asm = Assembly.LoadFile(Path.GetFullPath(conf.TransportDLL)); var asm = Assembly.LoadFile(Path.GetFullPath(conf.TransportDLL));
WriteLogMessage($"OK", ConsoleColor.Green); WriteLogMessage($"OK", ConsoleColor.Green);
@ -75,7 +75,7 @@ namespace LightReflectiveMirror
WriteLogMessage("\nStarting Transport... ", ConsoleColor.White, true); WriteLogMessage("\nStarting Transport... ", ConsoleColor.White, true);
transport.OnServerError = (clientID, error) => transport.OnServerError = (clientID, error) =>
{ {
WriteLogMessage($"Transport Error, Client: {clientID}, Error: {error}", ConsoleColor.Red); WriteLogMessage($"Transport Error, Client: {clientID}, Error: {error}", ConsoleColor.Red);
}; };
@ -106,10 +106,10 @@ namespace LightReflectiveMirror
_currentConnections.Remove(clientID); _currentConnections.Remove(clientID);
_relay.HandleDisconnect(clientID); _relay.HandleDisconnect(clientID);
if(NATConnections.ContainsKey(clientID)) if (NATConnections.ContainsKey(clientID))
NATConnections.Remove(clientID); NATConnections.Remove(clientID);
if(_pendingNATPunches.TryGetByFirst(clientID, out _)) if (_pendingNATPunches.TryGetByFirst(clientID, out _))
_pendingNATPunches.Remove(clientID); _pendingNATPunches.Remove(clientID);
}; };
@ -150,12 +150,12 @@ namespace LightReflectiveMirror
{ {
natThread.Start(); natThread.Start();
} }
catch(Exception e) catch (Exception e)
{ {
WriteLogMessage("FAILED\n" + e, ConsoleColor.DarkRed); WriteLogMessage("FAILED\n" + e, ConsoleColor.DarkRed);
} }
} }
catch(Exception e) catch (Exception e)
{ {
WriteLogMessage("FAILED\nCheck if port is in use.", ConsoleColor.DarkRed, true); WriteLogMessage("FAILED\nCheck if port is in use.", ConsoleColor.DarkRed, true);
Console.WriteLine(e); Console.WriteLine(e);
@ -169,7 +169,7 @@ namespace LightReflectiveMirror
Environment.Exit(0); Environment.Exit(0);
} }
} }
catch(Exception e) catch (Exception e)
{ {
WriteLogMessage("FAILED\nException: " + e, ConsoleColor.DarkRed); WriteLogMessage("FAILED\nException: " + e, ConsoleColor.DarkRed);
Console.ReadKey(); Console.ReadKey();
@ -182,16 +182,24 @@ namespace LightReflectiveMirror
while (true) while (true)
{ {
if (_updateMethod != null) _updateMethod.Invoke(transport, null); try
if (_lateUpdateMethod != null) _lateUpdateMethod.Invoke(transport, null); {
if (_updateMethod != null) _updateMethod.Invoke(transport, null);
if (_lateUpdateMethod != null) _lateUpdateMethod.Invoke(transport, null);
}
catch (Exception e)
{
WriteLogMessage("Error During Transport Update! " + e, ConsoleColor.Red);
}
_currentHeartbeatTimer++; _currentHeartbeatTimer++;
if(_currentHeartbeatTimer >= conf.UpdateHeartbeatInterval) if (_currentHeartbeatTimer >= conf.UpdateHeartbeatInterval)
{ {
_currentHeartbeatTimer = 0; _currentHeartbeatTimer = 0;
for(int i = 0; i < _currentConnections.Count; i++) for (int i = 0; i < _currentConnections.Count; i++)
transport.ServerSend(_currentConnections[i], 0, new ArraySegment<byte>(new byte[] { 200 })); transport.ServerSend(_currentConnections[i], 0, new ArraySegment<byte>(new byte[] { 200 }));
if (conf.UseLoadBalancer) if (conf.UseLoadBalancer)
@ -220,7 +228,7 @@ namespace LightReflectiveMirror
await wc.DownloadStringTaskAsync($"http://{conf.LoadBalancerAddress}:{conf.LoadBalancerPort}/api/roomsupdated"); await wc.DownloadStringTaskAsync($"http://{conf.LoadBalancerAddress}:{conf.LoadBalancerPort}/api/roomsupdated");
} }
} }
catch {} // LLB might be down, ignore. catch { } // LLB might be down, ignore.
} }
private async Task<bool> RegisterSelfToLoadBalancer() private async Task<bool> RegisterSelfToLoadBalancer()
@ -257,10 +265,10 @@ namespace LightReflectiveMirror
void CheckMethods(Type type) void CheckMethods(Type type)
{ {
_awakeMethod = type.GetMethod("Awake", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); _awakeMethod = type.GetMethod("Awake", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
_startMethod = type.GetMethod("Start", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); _startMethod = type.GetMethod("Start", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
_updateMethod = type.GetMethod("Update", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); _updateMethod = type.GetMethod("Update", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
_lateUpdateMethod = type.GetMethod("LateUpdate", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic); _lateUpdateMethod = type.GetMethod("LateUpdate", BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
} }
} }
} }