PvE/Torch
3
0
Fork 0
Code Issues 1 Pull Requests Actions Releases 21 Wiki Activity

Merge branch 'master' into PreRelease

Browse Source
This commit is contained in:
Brant Martin
2019-06-06 15:15:44 -04:00
parent 91ceb0aa22 ed298cdfb0
commit 59588517d8
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Torch.Server/Initializer.cs
View File

@@ -230,8 +230,9 @@ quit";
{ {
string path = Path.Combine(MyFileSystem.UserDataPath, "Minidump.dmp"); string path = Path.Combine(MyFileSystem.UserDataPath, "Minidump.dmp");
Log.Info($"Generating minidump at {path}"); Log.Info($"Generating minidump at {path}");
MyMiniDump.Options options = MyMiniDump.Options.WithProcessThreadData | MyMiniDump.Options.WithThreadInfo; Log.Error("Keen broke the minidump, sorry.");
MyMiniDump.Write(path, options, MyMiniDump.ExceptionInfo.Present); //MyMiniDump.Options options = MyMiniDump.Options.WithProcessThreadData | MyMiniDump.Options.WithThreadInfo;
//MyMiniDump.Write(path, options, MyMiniDump.ExceptionInfo.Present);
} }
LogManager.Flush(); LogManager.Flush();
if (_config.RestartOnCrash) if (_config.RestartOnCrash)

4
Torch/Torch.csproj
View File

@@ -65,6 +65,10 @@
</Reference> </Reference>
<Reference Include="PresentationCore" /> <Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" /> <Reference Include="PresentationFramework" />
<Reference Include="protobuf-net, Version=2.1.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\GameBinaries\protobuf-net.dll</HintPath>
</Reference>
<Reference Include="Sandbox.Common"> <Reference Include="Sandbox.Common">
<HintPath>..\GameBinaries\Sandbox.Common.dll</HintPath> <HintPath>..\GameBinaries\Sandbox.Common.dll</HintPath>
<Private>False</Private> <Private>False</Private>