Fixed minidumps and extra logging options

Author: Bishbash777

Torch.API/ITorchConfig.cs

@@ -30,6 +30,8 @@ public interface ITorchConfig
         int FontSize { get; set; }
         UGCServiceType UgcServiceType { get; set; }
         TorchBranchType BranchName { get; set; }
+        bool SendLogsToKeen { get; set; }
+        bool DeleteMiniDumps { get; set; }
 
         void Save(string path = null);
     }

Torch.Server/Initializer.cs

@@ -13,9 +13,13 @@
 using System.Windows.Threading;
 using NLog;
 using NLog.Targets;
+using Sandbox;
 using Sandbox.Engine.Utils;
 using Torch.Utils;
+using VRage;
 using VRage.FileSystem;
+using VRage.Scripting;
+using VRage.Utils;
 
 namespace Torch.Server
 {
@@ -60,6 +64,7 @@ public bool Initialize(string[] args)
 #endif
 
 #if DEBUG
+            AppDomain.CurrentDomain.UnhandledException += HandleException;
             //enables logging debug messages when built in debug mode. Amazing.
             LogManager.Configuration.AddRule(LogLevel.Debug, LogLevel.Debug, "main");
             LogManager.Configuration.AddRule(LogLevel.Debug, LogLevel.Debug, "console");
@@ -255,19 +260,37 @@ private void LogException(Exception ex)
             }
         }
 
+        private void SendAndDump()
+        {
+            var shortdate = DateTime.Now.ToString("yyyy-MM-dd");
+            var shortdateWithTime = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss");
+            
+            var dumpPath = $"Logs\\MiniDumpT{Thread.CurrentThread.ManagedThreadId}-{shortdateWithTime}.dmp";
+            Log.Info($"Generating minidump at {dumpPath}");
+            var dumpFlags = MyMiniDump.Options.Normal | MyMiniDump.Options.WithProcessThreadData | MyMiniDump.Options.WithThreadInfo;
+            MyVRage.Platform.CrashReporting.WriteMiniDump(dumpPath, dumpFlags, IntPtr.Zero);
+
+            if (Config.SendLogsToKeen)
+            {
+                List<string> additionalFiles = new List<string>();
+                if (File.Exists(dumpPath))
+                    additionalFiles.Add(dumpPath);
+                
+                CrashInfo info = MyErrorReporter.BuildCrashInfo();
+                MyErrorReporter.ReportNotInteractive($"Logs\\Keen-{shortdate}.log", info.AnalyticId, false,
+                    additionalFiles.ToList(), true, string.Empty, string.Empty, info);
+            }
+            
+            if(Config.DeleteMiniDumps)
+                File.Delete(dumpPath);
+        }
+
         private void HandleException(object sender, UnhandledExceptionEventArgs e)
         {
             _server.FatalException = true;
             var ex = (Exception)e.ExceptionObject;
             LogException(ex);
-            if (MyFakes.ENABLE_MINIDUMP_SENDING)
-            {
-                string path = Path.Combine(MyFileSystem.UserDataPath, "Minidump.dmp");
-                Log.Info($"Generating minidump at {path}");
-                Log.Error("Keen broke the minidump, sorry.");
-                //MyMiniDump.Options options = MyMiniDump.Options.WithProcessThreadData | MyMiniDump.Options.WithThreadInfo;
-                //MyMiniDump.Write(path, options, MyMiniDump.ExceptionInfo.Present);
-            }
+            SendAndDump();
             LogManager.Flush();
             if (Config.RestartOnCrash)
             {

Torch.Server/TorchConfig.cs

@@ -42,6 +42,8 @@ public class TorchConfig : CommandLine, ITorchConfig, INotifyPropertyChanged
         private int _fontSize = 16;
         private UGCServiceType _ugcServiceType = UGCServiceType.Steam;
         private TorchBranchType _torchBranch = TorchBranchType.master;
+        private bool _sendLogsToKeen;
+        private bool _deleteMiniDumps = true;
 
 
         /// <inheritdoc />
@@ -169,6 +171,16 @@ public TorchBranchType BranchName
         [Arg("asserts", "Enable Keen's assert logging.")]
         [Display(Name = "Enable Asserts", Description = "Enable Keen's assert logging.", GroupName = "Server")]
         public bool EnableAsserts { get => _enableAsserts; set => Set(value, ref _enableAsserts); }
+        
+        [Arg("sendlogstokeen", "On crash, send debug data and logs to Keen.")]
+        [Display(Name = "Send Logs To Keen", Description = "On crash, send debug data and logs to Keen.", GroupName = "Logging")]
+        public bool SendLogsToKeen { get => _sendLogsToKeen; set => Set(value, ref _sendLogsToKeen); }
+        
+        [Arg("delteminidumps", "Delete mini dumps after they are created")]
+        [Display(Name = "Delete Mini Dumps", Description = "Delete mini dumps after they are created", GroupName = "Logging")]
+        public bool DeleteMiniDumps { get => _deleteMiniDumps; set => Set(value, ref _deleteMiniDumps); }
+        
+        
 
         public event PropertyChangedEventHandler PropertyChanged;
 

Torch.Server/TorchServer.cs

@@ -12,6 +12,7 @@
 using NLog;
 using Sandbox;
 using Sandbox.Engine.Networking;
+using Sandbox.Game;
 using Sandbox.Game.Multiplayer;
 using Sandbox.Game.World;
 using Torch.API;
@@ -167,6 +168,7 @@ public override void Start()
             CanRun = false;
             PatchManager.CommitInternal();
             Log.Info("Starting server.");
+            MyPerGameSettings.BasicGameInfo.AnalyticId = "SEDS_TORCH";
             MySandboxGame.ConfigDedicated = DedicatedInstance.DedicatedConfig.Model;
 
             _uptime = Stopwatch.StartNew();