[Bot] Fix stacktrace not printing to console

Team-Dim · Sep 19, 2024 · 4ba24d3 · 4ba24d3
1 parent 0aaceb7
commit 4ba24d3
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 16 deletions.
diff --git a/Bot/Discord/Dc.cs b/Bot/Discord/Dc.cs
@@ -127,7 +127,7 @@ internal static async Task<RestUserMessage> NewExceptionLogAsync(Exception ex)
         }
 
         // Always waits until the exception is actually sent
-        return await Program.TryForeverAsync<RestUserMessage>(
+        return await Program.TryUntilAsync<RestUserMessage>(
             async () => await s_botLog.SendMessageAsync(s_botApp.Owner.Mention, embed: emb.Build())
             );
     }

diff --git a/Bot/Discord/ReadyHandler.cs b/Bot/Discord/ReadyHandler.cs
@@ -31,7 +31,7 @@ internal async Task RunAsync()
                 else if (_repeatCount < 10)
                 {
                     _repeatCount++;
-                    await Program.TryForeverAsync(async () =>
+                    await Program.TryUntilAsync(async () =>
                     {
                         await _msg!.ModifyAsync(mp => mp.Content = _msg.Content + "\n" + DateTime.Now.ToString("HH:mm:ss"));
                     });

diff --git a/Bot/Program.cs b/Bot/Program.cs
@@ -5,8 +5,11 @@ namespace Hyperstellar;
 
 public static class Program
 {
-    private static void DefaultTryForeverExceptionFunc(Exception ex) =>
-        Console.Error.WriteLine(GetExceptionStackTraceString(ex));
+    private static void DefaultTryForeverExceptionFunc(Exception ex)
+    {
+        ex.Demystify();
+        Console.WriteLine(ex);
+    }
 
     internal static string GetExceptionStackTraceString(Exception ex)
     {
@@ -45,7 +48,7 @@ internal static string GetExceptionStackTraceString(Exception ex)
         return msg;
     }
 
-    internal static async Task<T> TryForeverAsync<T>(Func<Task<T>> tryFunc, Func<Exception, Task>? repeatFunc = null)
+    internal static async Task<T> TryUntilAsync<T>(Func<Task<T>> tryFunc, Func<Exception, Task>? repeatFunc = null)
     {
         while (true)
         {
@@ -67,14 +70,18 @@ internal static async Task<T> TryForeverAsync<T>(Func<Task<T>> tryFunc, Func<Exc
         }
     }
 
-    internal static async Task TryForeverAsync(Func<Task> tryFunc, Func<Exception, Task>? repeatFunc = null)
+    internal static async Task TryUntilAsync(Func<Task> tryFunc, Func<Exception, Task>? repeatFunc = null,
+        bool runForever = false)
     {
         while (true)
         {
             try
             {
                 await tryFunc();
-                return;
+                if (!runForever)
+                {
+                    return;
+                }
             }
             catch (Exception ex)
             {

diff --git a/Bot/Sql/DbObj.cs b/Bot/Sql/DbObj.cs
@@ -19,11 +19,11 @@ internal static void Commit()
     internal static async Task InitAsync()
     {
         s_db.BeginTransaction();
-        await Program.TryForeverAsync(async () =>
+        await Program.TryUntilAsync(async () =>
         {
             await Task.Delay(5 * 60 * 1000);
             Commit();
-        });
+        }, runForever: true);
     }
 
     internal virtual int Insert() => s_db.Insert(this);

diff --git a/Bot/Sql/Member.cs b/Bot/Sql/Member.cs
@@ -32,30 +32,30 @@ public void AddAlt(Member altMember)
 
     public bool IsAlt()
     {
-        TableQuery<Alt> result = Db.s_db.Table<Alt>().Where(a => a.AltId == CocId);
+        TableQuery<Alt> result = s_db.Table<Alt>().Where(a => a.AltId == CocId);
         return result.Any();
     }
 
     public bool IsAltMain()
     {
-        TableQuery<Alt> result = Db.s_db.Table<Alt>().Where(a => a.MainId == CocId);
+        TableQuery<Alt> result = s_db.Table<Alt>().Where(a => a.MainId == CocId);
         return result.Any();
     }
 
-    public Alt? TryToAlt() => Db.s_db.Table<Alt>().FirstOrDefault(a => a.AltId == CocId);
+    public Alt? TryToAlt() => s_db.Table<Alt>().FirstOrDefault(a => a.AltId == CocId);
 
-    public Main? TryToMain() => Db.s_db.Table<Main>().FirstOrDefault(m => m.MainId == CocId);
+    public Main? TryToMain() => s_db.Table<Main>().FirstOrDefault(m => m.MainId == CocId);
 
-    public Main ToMain() => Db.s_db.Table<Main>().First(m => m.MainId == CocId);
+    public Main ToMain() => s_db.Table<Main>().First(m => m.MainId == CocId);
 
-    public TableQuery<Alt> GetAltsByMain() => Db.s_db.Table<Alt>().Where(a => a.MainId == CocId);
+    public TableQuery<Alt> GetAltsByMain() => s_db.Table<Alt>().Where(a => a.MainId == CocId);
 
     public string GetName() => Coc.GetMember(CocId).Name;
 
     public Main GetEffectiveMain()
     {
         Alt? alt = TryToAlt();
         string mainId = alt == null ? CocId : alt.MainId;
-        return Db.s_db.Table<Main>().First(m => m.MainId == mainId);
+        return s_db.Table<Main>().First(m => m.MainId == mainId);
     }
 }