aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/AssetServer/Main.cs12
-rw-r--r--OpenSim/Grid/GridServer/Main.cs10
-rw-r--r--OpenSim/Grid/UserServer/Main.cs9
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;
34using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
35using OpenSim.Framework.Types; 35using OpenSim.Framework.Types;
36using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
37using OpenSim.Framework.Utilities;
37 38
38namespace OpenSim.Grid.AssetServer 39namespace OpenSim.Grid.AssetServer
39{ 40{
@@ -71,7 +72,11 @@ namespace OpenSim.Grid.AssetServer
71 72
72 private OpenAsset_Main() 73 private OpenAsset_Main()
73 { 74 {
74 m_console = new LogBase("opengrid-AssetServer-console.log", "OpenAsset", this, false); 75 if(!Directory.Exists(Util.logDir()))
76 {
77 Directory.CreateDirectory(Util.logDir());
78 }
79 m_console = new LogBase((Path.Combine(Util.logDir(),"opengrid-AssetServer-console.log")), "OpenAsset", this, false);
75 MainLog.Instance = m_console; 80 MainLog.Instance = m_console;
76 } 81 }
77 82
@@ -154,10 +159,11 @@ namespace OpenSim.Grid.AssetServer
154 159
155 public void setupDB() 160 public void setupDB()
156 { 161 {
157 bool yapfile = File.Exists("gridassets.yap"); 162 string yappath=(Path.Combine(Util.dataDir(),"gridassets.yap"));
163 bool yapfile = File.Exists(yappath);
158 try 164 try
159 { 165 {
160 db = Db4oFactory.OpenFile("gridassets.yap"); 166 db = Db4oFactory.OpenFile(yappath);
161 MainLog.Instance.Verbose("storage", "Main.cs:setupDB() - creation"); 167 MainLog.Instance.Verbose("storage", "Main.cs:setupDB() - creation");
162 } 168 }
163 catch (Exception e) 169 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 @@
27*/ 27*/
28 28
29using System; 29using System;
30using System.IO;
30using System.Reflection; 31using System.Reflection;
31using System.Threading; 32using System.Threading;
32using System.Timers; 33using System.Timers;
@@ -34,6 +35,7 @@ using OpenSim.Framework.Console;
34using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Servers; 36using OpenSim.Framework.Servers;
36using OpenSim.Framework.Configuration; 37using OpenSim.Framework.Configuration;
38using OpenSim.Framework.Utilities;
37 39
38using Timer=System.Timers.Timer; 40using Timer=System.Timers.Timer;
39 41
@@ -84,7 +86,11 @@ namespace OpenSim.Grid.GridServer
84 86
85 private OpenGrid_Main() 87 private OpenGrid_Main()
86 { 88 {
87 m_console = new LogBase("opengrid-gridserver-console.log", "OpenGrid", this, false); 89 if (!Directory.Exists(Util.logDir()))
90 {
91 Directory.CreateDirectory(Util.logDir());
92 }
93 m_console = new LogBase((Path.Combine(Util.logDir(),"opengrid-gridserver-console.log")), "OpenGrid", this, false);
88 MainLog.Instance = m_console; 94 MainLog.Instance = m_console;
89 95
90 96
@@ -104,7 +110,7 @@ namespace OpenSim.Grid.GridServer
104 public void Startup() 110 public void Startup()
105 { 111 {
106 112
107 this.Cfg = new GridConfig("GRID SERVER","GridServer_Config.xml"); //Yeah srsly, that's it. 113 this.Cfg = new GridConfig("GRID SERVER",(Path.Combine(Util.configDir(),"GridServer_Config.xml"))); //Yeah srsly, that's it.
108 if (setuponly) Environment.Exit(0); 114 if (setuponly) Environment.Exit(0);
109 115
110 m_console.Verbose( "Main.cs:Startup() - Connecting to Storage Server"); 116 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 @@
28 28
29using System; 29using System;
30using System.Collections.Generic; 30using System.Collections.Generic;
31using System.IO;
31using System.Reflection; 32using System.Reflection;
32using libsecondlife; 33using libsecondlife;
33using OpenSim.Framework.Console; 34using OpenSim.Framework.Console;
@@ -64,7 +65,11 @@ namespace OpenSim.Grid.UserServer
64 65
65 private OpenUser_Main() 66 private OpenUser_Main()
66 { 67 {
67 m_console = new LogBase("opengrid-userserver-console.log", "OpenUser", this , false); 68 if (!Directory.Exists(Util.logDir()))
69 {
70 Directory.CreateDirectory(Util.logDir());
71 }
72 m_console = new LogBase((Path.Combine(Util.logDir(),"opengrid-userserver-console.log")), "OpenUser", this , false);
68 MainLog.Instance = m_console; 73 MainLog.Instance = m_console;
69 } 74 }
70 75
@@ -80,7 +85,7 @@ namespace OpenSim.Grid.UserServer
80 85
81 public void Startup() 86 public void Startup()
82 { 87 {
83 this.Cfg = new UserConfig("USER SERVER", "UserServer_Config.xml"); 88 this.Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
84 89
85 MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection"); 90 MainLog.Instance.Verbose("Main.cs:Startup() - Establishing data connection");
86 m_userManager = new UserManager(); 91 m_userManager = new UserManager();