cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-27 07:04:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Throw an aggregate exception if both alpha and bravo servers fail to start

Browse Source
This commit is contained in:
Cyberboss
2018-07-13 11:49:03 -04:00
parent 5a9a9cb422
commit f9f142bfb8
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Components/Watchdog/Watchdog.cs
+5 -2
View File
@@ -404,7 +404,7 @@ namespace Tgstation.Server.Host.Components.Watchdog
bravoServer = await bravoServerTask.ConfigureAwait(false);
alphaServer = await alphaServerTask.ConfigureAwait(false);
}
catch
catch (Exception e)
{
if (alphaServerTask != null)
if (alphaServerTask.Status == TaskStatus.RanToCompletion)
@@ -416,7 +416,10 @@ namespace Tgstation.Server.Host.Components.Watchdog
{
alphaServer = await alphaServerTask.ConfigureAwait(false);
}
catch { }
catch (Exception e2)
{
throw new AggregateException(e, e2);
}
}
throw;
}