Look for default config files in dll.config instead of exe.config bec…

…ause of dotnet changes.
OpenSim-NGC · Jun 23, 2024 · 127fee1 · 127fee1
1 parent 32b2123
commit 127fee1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
@@ -99,8 +99,8 @@ public static void Main(string[] args)
             }
             else
             {
-                XmlConfigurator.Configure(new System.IO.FileInfo("OpenSim.exe.config"));
-                m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.exe.config");
+                XmlConfigurator.Configure(new System.IO.FileInfo("OpenSim.dll.config"));
+                m_log.Info("[OPENSIM MAIN]: configured log4net using default OpenSim.dll.config");
             }
 
             // temporay set the platform dependent System.Drawing.Common.dll

diff --git a/OpenSim/Server/Base/ServicesServerBase.cs b/OpenSim/Server/Base/ServicesServerBase.cs
@@ -161,7 +161,8 @@ public ServicesServerBase(string prompt, string[] args) : base()
             }
             else
             {
-                XmlConfigurator.Configure(new FileInfo("Robust.exe.config"));
+                XmlConfigurator.Configure(new FileInfo("Robust.dll.config"));
+                m_log.Info("[ROBUST]: configured log4net using default Robust.dll.config");
             }
 
             RegisterCommonAppenders(startupConfig);

diff --git a/OpenSim/Tools/pCampBot/pCampBot.cs b/OpenSim/Tools/pCampBot/pCampBot.cs
@@ -56,7 +56,7 @@ public class pCampBot
         [STAThread]
         public static void Main(string[] args)
         {
-            XmlConfigurator.Configure(new System.IO.FileInfo("pCampBot.exe.config"));
+            XmlConfigurator.Configure(new System.IO.FileInfo("pCampBot.dll.config"));
 
             IConfig commandLineConfig = ParseConfig(args);
             if (commandLineConfig.Get("help") != null || commandLineConfig.Get("loginuri") == null)

diff --git a/bin/log4net.xml b/bin/log4net.xml
@@ -8802,7 +8802,7 @@
             </para>
             <para>
             The log4net configuration file can possible be specified in the application's
-            configuration file (either <c>MyAppName.exe.config</c> for a
+            configuration file (either <c>MyAppName.dll.config</c> for a
             normal application on <c>Web.config</c> for an ASP.NET application).
             </para>
             <example>
@@ -8867,7 +8867,7 @@
             </para>
             <para>
             The log4net configuration file can possible be specified in the application's
-            configuration file (either <c>MyAppName.exe.config</c> for a
+            configuration file (either <c>MyAppName.dll.config</c> for a
             normal application on <c>Web.config</c> for an ASP.NET application).
             </para>
             <example>
@@ -9367,7 +9367,7 @@
             </para>
             <para>
             The log4net configuration file can possible be specified in the application's
-            configuration file (either <c>MyAppName.exe.config</c> for a
+            configuration file (either <c>MyAppName.dll.config</c> for a
             normal application on <c>Web.config</c> for an ASP.NET application).
             </para>
             <para>
@@ -9465,7 +9465,7 @@
             </para>
             <para>
             The log4net configuration file can possible be specified in the application's
-            configuration file (either <c>MyAppName.exe.config</c> for a
+            configuration file (either <c>MyAppName.dll.config</c> for a
             normal application on <c>Web.config</c> for an ASP.NET application).
             </para>
             <para>