ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brian McBee
2007-08-03 18:01:55 +00:00
parent 0975ff6cfd
commit 599a6d32ee
11 changed files with 95 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
View File

@@ -31,6 +31,7 @@ using System.Xml;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Configuration.Interfaces;
using OpenSim.Framework.Utilities;
namespace OpenSim.Framework.Configuration
{
@@ -119,6 +120,11 @@ namespace OpenSim.Framework.Configuration
public void Commit()
{
if (!Directory.Exists(Util.configDir()))
{
Directory.CreateDirectory(Util.configDir());
}
doc.Save(fileName);
}

1
OpenSim/Framework/Console/LogBase.cs
View File

@@ -63,6 +63,7 @@ namespace OpenSim.Framework.Console
}
System.Console.WriteLine("Logs will be saved to current directory in " + LogFile);
Log = File.AppendText(LogFile);
Log.WriteLine("========================================================================");
Log.WriteLine(componentname + " Started at " + DateTime.Now.ToString());

4
OpenSim/Framework/Data.DB4o/DB4oUserData.cs
View File

@@ -26,7 +26,9 @@
*
*/
using System;
using System.IO;
using libsecondlife;
using OpenSim.Framework.Utilities;
namespace OpenSim.Framework.Data.DB4o
{
@@ -45,7 +47,7 @@ namespace OpenSim.Framework.Data.DB4o
/// </summary>
public void Initialise()
{
manager = new DB4oUserManager("userprofiles.yap");
manager = new DB4oUserManager(Path.Combine(Util.dataDir(),"userprofiles.yap"));
}
/// <summary>

6
OpenSim/Framework/General/Types/EstateSettings.cs
View File

@@ -25,9 +25,11 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
using System.IO;
using libsecondlife;
using OpenSim.Framework.Configuration;
using OpenSim.Framework.Utilities;
namespace OpenSim.Framework.Types
{
public class EstateSettings
@@ -554,7 +556,7 @@ namespace OpenSim.Framework.Types
private ConfigurationMember configMember;
public EstateSettings()
{
configMember = new ConfigurationMember("estate_settings.xml", "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration);
configMember = new ConfigurationMember(Path.Combine(Util.configDir(),"estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration);
configMember.performConfigurationRetrieve();
}

34
OpenSim/Framework/General/Util.cs
View File

@@ -26,6 +26,7 @@
*
*/
using System;
using System.IO;
using System.Security.Cryptography;
using System.Net;
using System.Text;
@@ -275,6 +276,39 @@ namespace OpenSim.Framework.Utilities
return null;
}
//
// directory locations
//
public static string homeDir()
{
string temp;
// string personal=(Environment.GetFolderPath(Environment.SpecialFolder.Personal));
// temp = Path.Combine(personal,".OpenSim");
temp=".";
return temp;
}
public static string configDir()
{
string temp;
temp = ".";
return temp;
}
public static string dataDir()
{
string temp;
temp = ".";
return temp;
}
public static string logDir()
{
string temp;
temp = ".";
return temp;
}
public Util()
{