space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Please actually fix the server crashes thanks.

Browse Source
This commit is contained in:
Pieter-Jan Briers
2020-07-13 01:56:42 +02:00
parent a5f6363219
commit df4e8e3175
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Robust.Server/GameStates/ServerGameStateManager.cs
View File

@@ -121,7 +121,7 @@ namespace Robust.Server.GameStates
var oldDeps = IoCManager.Resolve<IDependencyCollection>();
var deps = new DependencyCollection();
deps.RegisterInstance<ILogManager>(IoCManager.Resolve<ILogManager>());
deps.RegisterInstance<ILogManager>(new ProxyLogManager(IoCManager.Resolve<ILogManager>()));
deps.BuildGraph();
(MsgState, INetChannel) GenerateMail(IPlayerSession session)

21
Robust.Server/ServerStatus/StatusHost.HttpContext.cs
View File

@@ -44,28 +44,15 @@ namespace Robust.Server.ServerStatus
return;
}
IoCManager.Clear();
ILogManager? logMgr = null;
WaitSync(() =>
{
logMgr = IoCManager.Resolve<ILogManager>();
}, ApplicationStopping);
IoCManager.InitThread();
if (logMgr != null)
{
try
{
IoCManager.RegisterInstance<ILogManager>(new ProxyLogManager(logMgr));
}
catch (Exception ex)
{
logMgr.GetSawmill("http").Error("Can't register log manager instance on thread.\n" + ex);
}
}
IoCManager.BuildGraph();
var deps = new DependencyCollection();
deps.RegisterInstance<ILogManager>(new ProxyLogManager(logMgr));
deps.BuildGraph();
IoCManager.InitThread(deps, true);
}
}
}