Normalizing some interfaces to allow better extending them with the param objects[] @param stunt later.

Lisias · Lisias · commit fe62163768c7 · 2024-03-11T13:45:39.000-03:00
diff --git a/Source/ModuleManager/Logging/IBasicLogger.cs b/Source/ModuleManager/Logging/IBasicLogger.cs
@@ -24,7 +24,7 @@ namespace ModuleManager.Logging
     public interface IBasicLogger
     {
         void Log(K.Level logType, string message, params object[] @params);
-        void Exception(string message, Exception exception);
+        void Exception(Exception exception, string message);
         void Finish();
     }
 }
diff --git a/Source/ModuleManager/Logging/ModLogger.cs b/Source/ModuleManager/Logging/ModLogger.cs
@@ -41,7 +41,7 @@ private ModLogger()
 
         public void Log(K.Level logType, string message, params object[] @params) => this.methods[(int)logType](message, @params);
 
-        public void Exception(string message, Exception exception)
+        public void Exception(Exception exception, string message)
         {
             LOG.error(exception, message);
         }
diff --git a/Source/ModuleManager/Logging/PatchLogger.cs b/Source/ModuleManager/Logging/PatchLogger.cs
@@ -43,7 +43,7 @@ internal PatchLogger(string filename)
 
         public void Log(K.Level logType, string message, object[] @params) => this.methods[(int)logType](message, @params);
 
-        public void Exception(string message, Exception exception)
+        public void Exception(Exception exception, string message)
         {
             this.log.error(exception, message);
         }
diff --git a/Source/ModuleManager/MMPatchLoader.cs b/Source/ModuleManager/MMPatchLoader.cs
@@ -90,7 +90,7 @@ public IEnumerable<IProtoUrlConfig> Run()
             }
             catch (Exception ex)
             {
-                logger.Exception("Exception in IsCacheUpToDate", ex);
+                logger.Exception(ex, "Exception in IsCacheUpToDate");
             }
 
             IEnumerable<IProtoUrlConfig> databaseConfigs = null;
@@ -190,7 +190,7 @@ public IEnumerable<IProtoUrlConfig> Run()
                     }
                     catch (Exception e)
                     {
-                        patchLogger.Exception("Exception while deleting stale cache ", e);
+                        patchLogger.Exception(e, "Exception while deleting stale cache ");
                     }
                 }
                 else
@@ -498,7 +498,7 @@ private void CreateCache(IEnumerable<IProtoUrlConfig> databaseConfigs, int patch
             }
             catch (Exception e)
             {
-                logger.Exception("Exception while saving the sha", e);
+                logger.Exception(e, "Exception while saving the sha");
             }
             try
             {
@@ -507,11 +507,11 @@ private void CreateCache(IEnumerable<IProtoUrlConfig> databaseConfigs, int patch
             }
             catch (NullReferenceException e)
             {
-                logger.Exception("NullReferenceException while saving the cache", e);
+                logger.Exception(e, "NullReferenceException while saving the cache");
             }
             catch (Exception e)
             {
-                logger.Exception("Exception while saving the cache", e);
+                logger.Exception(e, "Exception while saving the cache");
             }
 
             try
@@ -522,7 +522,7 @@ private void CreateCache(IEnumerable<IProtoUrlConfig> databaseConfigs, int patch
             }
             catch (Exception e)
             {
-                logger.Exception("Exception while deleting the cache", e);
+                logger.Exception(e, "Exception while deleting the cache");
             }
         }
 
diff --git a/Source/ModuleManager/MMPatchRunner.cs b/Source/ModuleManager/MMPatchRunner.cs
@@ -73,7 +73,7 @@ public IEnumerator Run()
 
             if (patchingThreadStatus.IsExitedWithError)
             {
-                kspLogger.Exception("The patching thread threw an exception", patchingThreadStatus.Exception);
+                kspLogger.Exception(patchingThreadStatus.Exception, "The patching thread threw an exception");
                 FatalErrorHandler.HandleFatalError("The patching thread threw an exception");
                 yield break;
             }
diff --git a/Source/ModuleManager/ModListGenerator.cs b/Source/ModuleManager/ModListGenerator.cs
@@ -85,7 +85,7 @@ public static IEnumerable<string> GenerateModList(IEnumerable<ModAddedByAssembly
                 }
                 catch (Exception e)
                 {
-                    progress.Exception("Exception while generating SHA for assembly " + assemblyName.Name, e);
+                    progress.Exception(e, "Exception while generating SHA for assembly " + assemblyName.Name);
                 }
 
                 modListInfo.AppendFormat(
@@ -212,14 +212,14 @@ public static IEnumerable<ModAddedByAssembly> GetAdditionalModsFromStaticMethods
                             }
                             catch (Exception e)
                             {
-                                logger.Exception("Exception while calling " + methodName, e);
+                                logger.Exception(e, "Exception while calling " + methodName);
                             }
                         }
                     }
                 }
                 catch (Exception e)
                 {
-                    logger.Exception("Add to mod list threw an exception in loading " + ass.FullName, e);
+                    logger.Exception(e, "Add to mod list threw an exception in loading " + ass.FullName);
                 }
             }
 
@@ -248,7 +248,7 @@ public static IEnumerable<ModAddedByAssembly> GetAdditionalModsFromStaticMethods
                     }
                     catch (Exception e)
                     {
-                        logger.Exception("Exception while calling " + methodName, e);
+                        logger.Exception(e, "Exception while calling " + methodName);
                     }
                 }
             }
diff --git a/Source/ModuleManager/NeedsChecker.cs b/Source/ModuleManager/NeedsChecker.cs
@@ -154,12 +154,12 @@ private void CheckNeedsRecursive(NodeStack nodeStack, UrlDir.UrlConfig urlConfig
                 }
                 catch (ArgumentOutOfRangeException e)
                 {
-                    progress.Exception("ArgumentOutOfRangeException in CheckNeeds for value \"" + val.name + "\"", e);
+                    progress.Exception(e, "ArgumentOutOfRangeException in CheckNeeds for value \"" + val.name + "\"");
                     throw;
                 }
                 catch (Exception e)
                 {
-                    progress.Exception("General Exception in CheckNeeds for value \"" + val.name + "\"", e);
+                    progress.Exception(e, "General Exception in CheckNeeds for value \"" + val.name + "\"");
                     throw;
                 }
             }
@@ -190,12 +190,12 @@ private void CheckNeedsRecursive(NodeStack nodeStack, UrlDir.UrlConfig urlConfig
                 }
                 catch (ArgumentOutOfRangeException e)
                 {
-                    progress.Exception("ArgumentOutOfRangeException in CheckNeeds for node \"" + node.name + "\"", e);
+                    progress.Exception(e, "ArgumentOutOfRangeException in CheckNeeds for node \"" + node.name + "\"");
                     throw;
                 }
                 catch (Exception e)
                 {
-                    progress.Exception("General Exception " + e.GetType().Name + " for node \"" + node.name + "\"", e);
+                    progress.Exception(e, "General Exception " + e.GetType().Name + " for node \"" + node.name + "\"");
                     throw;
                 }
             }
diff --git a/Source/ModuleManager/PatchApplier.cs b/Source/ModuleManager/PatchApplier.cs
@@ -61,7 +61,7 @@ private void ApplyPatches(LinkedList<IProtoUrlConfig> databaseConfigs, IPass pas
                 }
                 catch (Exception e)
                 {
-                    progress.Exception(patch.UrlConfig, "Exception while processing node : " + patch.UrlConfig.SafeUrl(), e);
+                    progress.Exception(e, patch.UrlConfig, "Exception while processing node : " + patch.UrlConfig.SafeUrl());
                     logger.Error("Processed node was\n" + patch.UrlConfig.PrettyPrint());
                 }
             }
diff --git a/Source/ModuleManager/PatchExtractor.cs b/Source/ModuleManager/PatchExtractor.cs
@@ -124,7 +124,7 @@ public IPatch ExtractPatch(UrlDir.UrlConfig urlConfig)
             }
             catch(Exception e)
             {
-                progress.Exception(urlConfig, $"Exception while attempting to create patch from config: {urlConfig.SafeUrl()}", e);
+                progress.Exception(e, urlConfig, $"Exception while attempting to create patch from config: {urlConfig.SafeUrl()}");
                 return null;
             }
         }
diff --git a/Source/ModuleManager/Patches/CopyPatch.cs b/Source/ModuleManager/Patches/CopyPatch.cs
@@ -68,7 +68,7 @@ public void Apply(LinkedList<IProtoUrlConfig> databaseConfigs, IPatchProgress pr
                 }
                 catch (Exception ex)
                 {
-                    progress.Exception(UrlConfig, $"Exception while applying copy {UrlConfig.SafeUrl()} to {protoConfig.FullUrl}", ex);
+                    progress.Exception(ex, UrlConfig, $"Exception while applying copy {UrlConfig.SafeUrl()} to {protoConfig.FullUrl}");
                 }
             }
         }
diff --git a/Source/ModuleManager/Patches/DeletePatch.cs b/Source/ModuleManager/Patches/DeletePatch.cs
@@ -61,7 +61,7 @@ public void Apply(LinkedList<IProtoUrlConfig> databaseConfigs, IPatchProgress pr
                 }
                 catch (Exception ex)
                 {
-                    progress.Exception(UrlConfig, $"Exception while applying delete {UrlConfig.SafeUrl()} to {protoConfig.FullUrl}", ex);
+                    progress.Exception(ex, UrlConfig, $"Exception while applying delete {UrlConfig.SafeUrl()} to {protoConfig.FullUrl}");
                 }
             }
         }
diff --git a/Source/ModuleManager/Patches/EditPatch.cs b/Source/ModuleManager/Patches/EditPatch.cs
@@ -69,7 +69,7 @@ public void Apply(LinkedList<IProtoUrlConfig> databaseConfigs, IPatchProgress pr
                 }
                 catch (Exception ex)
                 {
-                    progress.Exception(UrlConfig, $"Exception while applying update {UrlConfig.SafeUrl()} to {protoConfig.FullUrl}", ex);
+                    progress.Exception(ex, UrlConfig, $"Exception while applying update {UrlConfig.SafeUrl()} to {protoConfig.FullUrl}");
                 }
             }
         }
diff --git a/Source/ModuleManager/PostPatchLoader.cs b/Source/ModuleManager/PostPatchLoader.cs
@@ -162,7 +162,7 @@ private IEnumerator Run()
                 }
                 catch (Exception e)
                 {
-                    logger.Exception("Exception while running a post patch callback", e);
+                    logger.Exception(e, "Exception while running a post patch callback");
                 }
                 yield return null;
             }
@@ -186,14 +186,14 @@ private IEnumerator Run()
                             }
                             catch (Exception e)
                             {
-                                logger.Exception("Exception while calling " + ass.GetName().Name + "." + type.Name + "." + method.Name + "()", e);
+                                logger.Exception(e, "Exception while calling " + ass.GetName().Name + "." + type.Name + "." + method.Name + "()");
                             }
                         }
                     }
                 }
                 catch (Exception e)
                 {
-                    logger.Exception("Post run call threw an exception in loading " + ass.FullName, e);
+                    logger.Exception(e, "Post run call threw an exception in loading " + ass.FullName);
                 }
             }
 
@@ -213,7 +213,7 @@ private IEnumerator Run()
                     }
                     catch (Exception e)
                     {
-                        logger.Exception("Exception while calling " + obj.GetType().Name + "." + method.Name + "() :", e);
+                        logger.Exception(e, "Exception while calling " + obj.GetType().Name + "." + method.Name + "() :");
                     }
                 }
             }
diff --git a/Source/ModuleManager/Progress/IPatchProgress.cs b/Source/ModuleManager/Progress/IPatchProgress.cs
@@ -28,8 +28,8 @@ public interface IPatchProgress
         void Warning(UrlDir.UrlConfig url, string message);
         void Error(UrlDir.UrlConfig url, string message);
         void Error(string message);
-        void Exception(string message, Exception exception);
-        void Exception(UrlDir.UrlConfig url, string message, Exception exception);
+        void Exception(Exception exception, string message);
+        void Exception(Exception exception, UrlDir.UrlConfig url, string message);
         void NeedsUnsatisfiedRoot(UrlDir.UrlConfig url);
         void NeedsUnsatisfiedNode(UrlDir.UrlConfig url, string path);
         void NeedsUnsatisfiedValue(UrlDir.UrlConfig url, string path);
diff --git a/Source/ModuleManager/Progress/PatchProgress.cs b/Source/ModuleManager/Progress/PatchProgress.cs
@@ -135,15 +135,15 @@ public void Error(string message)
             logger.Error(message);
         }
 
-        public void Exception(string message, Exception exception)
+        public void Exception(Exception exception, string message)
         {
             Counter.exceptions.Increment();
-            logger.Exception(message, exception);
+            logger.Exception(exception, message);
         }
 
-        public void Exception(UrlDir.UrlConfig url, string message, Exception exception)
+        public void Exception(Exception exception, UrlDir.UrlConfig url, string message)
         {
-            Exception(message, exception);
+            Exception(exception, message);
             RecordErrorFile(url);
         }
 
diff --git a/Source/ModuleManager/Utils/ConfigNodeEditUtils.cs b/Source/ModuleManager/Utils/ConfigNodeEditUtils.cs
@@ -84,9 +84,9 @@ public string FindAndReplaceValue(
 						}
 						catch (Exception ex)
 						{
-							context.progress.Exception(context.patchUrl, "Error - Failed to do a regexp replacement: " + mod.name + " : original value=\"" + oValue +
+							context.progress.Exception(ex, context.patchUrl, "Error - Failed to do a regexp replacement: " + mod.name + " : original value=\"" + oValue +
 								"\" regexp=\"" + value +
-								"\" \nNote - to use regexp, the first char is used to subdivide the string (much like sed)", ex);
+								"\" \nNote - to use regexp, the first char is used to subdivide the string (much like sed)");
 							return null;
 						}
 					}

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ namespace ModuleManager.Logging`
`24`	`24`	`public interface IBasicLogger`
`25`	`25`	`{`
`26`	`26`	`void Log(K.Level logType, string message, params object[] @params);`
`27`		`- void Exception(string message, Exception exception);`
	`27`	`+ void Exception(Exception exception, string message);`
`28`	`28`	`void Finish();`
`29`	`29`	`}`
`30`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ private ModLogger()`
`41`	`41`
`42`	`42`	`public void Log(K.Level logType, string message, params object[] @params) => this.methods[(int)logType](message, @params);`
`43`	`43`
`44`		`- public void Exception(string message, Exception exception)`
	`44`	`+ public void Exception(Exception exception, string message)`
`45`	`45`	`{`
`46`	`46`	`LOG.error(exception, message);`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ internal PatchLogger(string filename)`
`43`	`43`
`44`	`44`	`public void Log(K.Level logType, string message, object[] @params) => this.methods[(int)logType](message, @params);`
`45`	`45`
`46`		`- public void Exception(string message, Exception exception)`
	`46`	`+ public void Exception(Exception exception, string message)`
`47`	`47`	`{`
`48`	`48`	`this.log.error(exception, message);`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ public IEnumerable<IProtoUrlConfig> Run()`
`90`	`90`	`}`
`91`	`91`	`catch (Exception ex)`
`92`	`92`	`{`
`93`		`- logger.Exception("Exception in IsCacheUpToDate", ex);`
	`93`	`+ logger.Exception(ex, "Exception in IsCacheUpToDate");`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`IEnumerable<IProtoUrlConfig> databaseConfigs = null;`
`@@ -190,7 +190,7 @@ public IEnumerable<IProtoUrlConfig> Run()`
`190`	`190`	`}`
`191`	`191`	`catch (Exception e)`
`192`	`192`	`{`
`193`		`- patchLogger.Exception("Exception while deleting stale cache ", e);`
	`193`	`+ patchLogger.Exception(e, "Exception while deleting stale cache ");`
`194`	`194`	`}`
`195`	`195`	`}`
`196`	`196`	`else`
`@@ -498,7 +498,7 @@ private void CreateCache(IEnumerable<IProtoUrlConfig> databaseConfigs, int patch`
`498`	`498`	`}`
`499`	`499`	`catch (Exception e)`
`500`	`500`	`{`
`501`		`- logger.Exception("Exception while saving the sha", e);`
	`501`	`+ logger.Exception(e, "Exception while saving the sha");`
`502`	`502`	`}`
`503`	`503`	`try`
`504`	`504`	`{`
`@@ -507,11 +507,11 @@ private void CreateCache(IEnumerable<IProtoUrlConfig> databaseConfigs, int patch`
`507`	`507`	`}`
`508`	`508`	`catch (NullReferenceException e)`
`509`	`509`	`{`
`510`		`- logger.Exception("NullReferenceException while saving the cache", e);`
	`510`	`+ logger.Exception(e, "NullReferenceException while saving the cache");`
`511`	`511`	`}`
`512`	`512`	`catch (Exception e)`
`513`	`513`	`{`
`514`		`- logger.Exception("Exception while saving the cache", e);`
	`514`	`+ logger.Exception(e, "Exception while saving the cache");`
`515`	`515`	`}`
`516`	`516`
`517`	`517`	`try`
`@@ -522,7 +522,7 @@ private void CreateCache(IEnumerable<IProtoUrlConfig> databaseConfigs, int patch`
`522`	`522`	`}`
`523`	`523`	`catch (Exception e)`
`524`	`524`	`{`
`525`		`- logger.Exception("Exception while deleting the cache", e);`
	`525`	`+ logger.Exception(e, "Exception while deleting the cache");`
`526`	`526`	`}`
`527`	`527`	`}`
`528`	`528`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public IEnumerator Run()`
`73`	`73`
`74`	`74`	`if (patchingThreadStatus.IsExitedWithError)`
`75`	`75`	`{`
`76`		`- kspLogger.Exception("The patching thread threw an exception", patchingThreadStatus.Exception);`
	`76`	`+ kspLogger.Exception(patchingThreadStatus.Exception, "The patching thread threw an exception");`
`77`	`77`	`FatalErrorHandler.HandleFatalError("The patching thread threw an exception");`
`78`	`78`	`yield break;`
`79`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public static IEnumerable<string> GenerateModList(IEnumerable<ModAddedByAssembly`
`85`	`85`	`}`
`86`	`86`	`catch (Exception e)`
`87`	`87`	`{`
`88`		`- progress.Exception("Exception while generating SHA for assembly " + assemblyName.Name, e);`
	`88`	`+ progress.Exception(e, "Exception while generating SHA for assembly " + assemblyName.Name);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`modListInfo.AppendFormat(`
`@@ -212,14 +212,14 @@ public static IEnumerable<ModAddedByAssembly> GetAdditionalModsFromStaticMethods`
`212`	`212`	`}`
`213`	`213`	`catch (Exception e)`
`214`	`214`	`{`
`215`		`- logger.Exception("Exception while calling " + methodName, e);`
	`215`	`+ logger.Exception(e, "Exception while calling " + methodName);`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`	`}`
`220`	`220`	`catch (Exception e)`
`221`	`221`	`{`
`222`		`- logger.Exception("Add to mod list threw an exception in loading " + ass.FullName, e);`
	`222`	`+ logger.Exception(e, "Add to mod list threw an exception in loading " + ass.FullName);`
`223`	`223`	`}`
`224`	`224`	`}`
`225`	`225`
`@@ -248,7 +248,7 @@ public static IEnumerable<ModAddedByAssembly> GetAdditionalModsFromStaticMethods`
`248`	`248`	`}`
`249`	`249`	`catch (Exception e)`
`250`	`250`	`{`
`251`		`- logger.Exception("Exception while calling " + methodName, e);`
	`251`	`+ logger.Exception(e, "Exception while calling " + methodName);`
`252`	`252`	`}`
`253`	`253`	`}`
`254`	`254`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,12 +154,12 @@ private void CheckNeedsRecursive(NodeStack nodeStack, UrlDir.UrlConfig urlConfig`
`154`	`154`	`}`
`155`	`155`	`catch (ArgumentOutOfRangeException e)`
`156`	`156`	`{`
`157`		`- progress.Exception("ArgumentOutOfRangeException in CheckNeeds for value \"" + val.name + "\"", e);`
	`157`	`+ progress.Exception(e, "ArgumentOutOfRangeException in CheckNeeds for value \"" + val.name + "\"");`
`158`	`158`	`throw;`
`159`	`159`	`}`
`160`	`160`	`catch (Exception e)`
`161`	`161`	`{`
`162`		`- progress.Exception("General Exception in CheckNeeds for value \"" + val.name + "\"", e);`
	`162`	`+ progress.Exception(e, "General Exception in CheckNeeds for value \"" + val.name + "\"");`
`163`	`163`	`throw;`
`164`	`164`	`}`
`165`	`165`	`}`
`@@ -190,12 +190,12 @@ private void CheckNeedsRecursive(NodeStack nodeStack, UrlDir.UrlConfig urlConfig`
`190`	`190`	`}`
`191`	`191`	`catch (ArgumentOutOfRangeException e)`
`192`	`192`	`{`
`193`		`- progress.Exception("ArgumentOutOfRangeException in CheckNeeds for node \"" + node.name + "\"", e);`
	`193`	`+ progress.Exception(e, "ArgumentOutOfRangeException in CheckNeeds for node \"" + node.name + "\"");`
`194`	`194`	`throw;`
`195`	`195`	`}`
`196`	`196`	`catch (Exception e)`
`197`	`197`	`{`
`198`		`- progress.Exception("General Exception " + e.GetType().Name + " for node \"" + node.name + "\"", e);`
	`198`	`+ progress.Exception(e, "General Exception " + e.GetType().Name + " for node \"" + node.name + "\"");`
`199`	`199`	`throw;`
`200`	`200`	`}`
`201`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ private void ApplyPatches(LinkedList<IProtoUrlConfig> databaseConfigs, IPass pas`
`61`	`61`	`}`
`62`	`62`	`catch (Exception e)`
`63`	`63`	`{`
`64`		`- progress.Exception(patch.UrlConfig, "Exception while processing node : " + patch.UrlConfig.SafeUrl(), e);`
	`64`	`+ progress.Exception(e, patch.UrlConfig, "Exception while processing node : " + patch.UrlConfig.SafeUrl());`
`65`	`65`	`logger.Error("Processed node was\n" + patch.UrlConfig.PrettyPrint());`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -124,7 +124,7 @@ public IPatch ExtractPatch(UrlDir.UrlConfig urlConfig)`
`124`	`124`	`}`
`125`	`125`	`catch(Exception e)`
`126`	`126`	`{`
`127`		`- progress.Exception(urlConfig, $"Exception while attempting to create patch from config: {urlConfig.SafeUrl()}", e);`
	`127`	`+ progress.Exception(e, urlConfig, $"Exception while attempting to create patch from config: {urlConfig.SafeUrl()}");`
`128`	`128`	`return null;`
`129`	`129`	`}`
`130`	`130`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public void Apply(LinkedList<IProtoUrlConfig> databaseConfigs, IPatchProgress pr`
`68`	`68`	`}`
`69`	`69`	`catch (Exception ex)`
`70`	`70`	`{`
`71`		`- progress.Exception(UrlConfig, $"Exception while applying copy {UrlConfig.SafeUrl()} to {protoConfig.FullUrl}", ex);`
	`71`	`+ progress.Exception(ex, UrlConfig, $"Exception while applying copy {UrlConfig.SafeUrl()} to {protoConfig.FullUrl}");`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`}`