Changes to prepare for future possible configuration of separate logdir, configdir, datadir.

3 files changed, 24 insertions, 7 deletions

diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs
index 92d5490..b581a1e 100644
--- a/OpenSim/Grid/AssetServer/Main.cs
+++ b/OpenSim/Grid/AssetServer/Main.cs
@@ -34,6 +34,7 @@ using libsecondlife;
 using OpenSim.Framework.Console;
 using OpenSim.Framework.Types;
 using OpenSim.Framework.Servers;
+using OpenSim.Framework.Utilities;
 
 namespace OpenSim.Grid.AssetServer
 {
@@ -71,7 +72,11 @@ namespace OpenSim.Grid.AssetServer
 
         private OpenAsset_Main()
         {
-            m_console = new LogBase("opengrid-AssetServer-console.log", "OpenAsset", this, false);
+            if(!Directory.Exists(Util.logDir()))
+            {
+                Directory.CreateDirectory(Util.logDir());
+            }
+            m_console = new LogBase((Path.Combine(Util.logDir(),"opengrid-AssetServer-console.log")), "OpenAsset", this, false);
             MainLog.Instance = m_console;
         }
 
@@ -154,10 +159,11 @@ namespace OpenSim.Grid.AssetServer
 
         public void setupDB()
         {
-            bool yapfile = File.Exists("gridassets.yap");
+            string yappath=(Path.Combine(Util.dataDir(),"gridassets.yap"));
+            bool yapfile = File.Exists(yappath);
             try
             {
-                db = Db4oFactory.OpenFile("gridassets.yap");
+                db = Db4oFactory.OpenFile(yappath);
                 MainLog.Instance.Verbose("storage", "Main.cs:setupDB() - creation");
             }
             catch (Exception e)
diff --git a/OpenSim/Grid/GridServer/Main.cs b/OpenSim/Grid/GridServer/Main.cs
index f9accab..ecf3b9d 100644
--- a/OpenSim/Grid/GridServer/Main.cs
+++ b/OpenSim/Grid/GridServer/Main.cs
@@ -27,6 +27,7 @@
 */
 
 using System;
+using System.IO;
 using System.Reflection;
 using System.Threading;
 using System.Timers;
@@ -34,6 +35,7 @@ using OpenSim.Framework.Console;
 using OpenSim.Framework.Interfaces;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Configuration;
+using OpenSim.Framework.Utilities;
 
 using Timer=System.Timers.Timer;
 
@@ -84,7 +86,11 @@ namespace OpenSim.Grid.GridServer
 
         private OpenGrid_Main()
         {
-            m_console = new LogBase("opengrid-gridserver-console.log", "OpenGrid", this, false);
+            if (!Directory.Exists(Util.logDir()))
+            {
+                Directory.CreateDirectory(Util.logDir());
+            }
+            m_console = new LogBase((Path.Combine(Util.logDir(),"opengrid-gridserver-console.log")), "OpenGrid", this, false);
             MainLog.Instance = m_console;
 
 
@@ -104,7 +110,7 @@ namespace OpenSim.Grid.GridServer
         public void Startup()
         {
 
-            this.Cfg = new GridConfig("GRID SERVER","GridServer_Config.xml"); //Yeah srsly, that's it.
+            this.Cfg = new GridConfig("GRID SERVER",(Path.Combine(Util.configDir(),"GridServer_Config.xml"))); //Yeah srsly, that's it.
             if (setuponly) Environment.Exit(0);
 
             m_console.Verbose( "Main.cs:Startup() - Connecting to Storage Server");
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs
index 32d8da9..04f45b0 100644
--- a/OpenSim/Grid/UserServer/Main.cs
+++ b/OpenSim/Grid/UserServer/Main.cs
@@ -28,6 +28,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Reflection;
 using libsecondlife;
 using OpenSim.Framework.Console;
@@ -64,7 +65,11 @@ namespace OpenSim.Grid.UserServer
 
         private OpenUser_Main()
         {
-            m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false);
+            if (!Directory.Exists(Util.logDir()))
+            {
+                Directory.CreateDirectory(Util.logDir());
+            }
+            m_console = new LogBase((Path.Combine(Util.logDir(),"opengrid-userserver-console.log")), "OpenUser", this , false);
             MainLog.Instance = m_console;
         }
 
@@ -80,7 +85,7 @@ namespace OpenSim.Grid.UserServer
 
         public void Startup()
         {
-            this.Cfg = new UserConfig("USER SERVER", "UserServer_Config.xml");
+            this.Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
 
             MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection");
             m_userManager = new UserManager();