OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

come up nicer on startup if the opensim.ini section isn't there

0.6.0-stable
Sean Dague 2008-09-03 18:04:42 +00:00
parent 4ddc7d66d6
commit 9082316757
1 changed files with 78 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
OpenSim/Region/Environment/Modules/ContentManagementSystem/ContentManagementModule.cs
View File

@ -1,8 +1,6 @@
// ContentManagementModule.cs
// User: bongiojp
using System;
using System.Collections.Generic;
using libsecondlife;
@ -18,84 +16,86 @@ using System.Threading;
namespace OpenSim.Region.Environment.Modules.ContentManagement
{
public class ContentManagementModule : IRegionModule
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
CMController m_control = null;
CMModel m_model = null;
CMView m_view = null;
bool initialised = false;
bool m_posted = false;
bool m_enabled = true;
public class ContentManagementModule : IRegionModule
{
private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
CMController m_control = null;
CMModel m_model = null;
CMView m_view = null;
bool initialised = false;
bool m_posted = false;
bool m_enabled = false;
public void Initialise(Scene scene, IConfigSource source)
public void Initialise(Scene scene, IConfigSource source)
{
string databaseDir = "./";
string database = "FilesyStemDatabase";
int channel = 345;
try
{
if (!source.Configs["CMS"].GetBoolean("Enabled", false))
m_enabled = false;
string databaseDir = "./";
string database = "FileSystemDatabase";
int channel = 345;
try
{
if (source.Configs["CMS"] == null)
return;
databaseDir = source.Configs["CMS"].GetString("Directory", databaseDir);
database = source.Configs["CMS"].GetString("Database", database);
channel = source.Configs["CMS"].GetInt("Channel", channel);
if (database != "FileSystemDatabase" && database != "GitDatabase")
{
m_log.ErrorFormat("[Content Management]: The Database attribute must be defined as either FileSystemDatabase or GitDatabase");
m_enabled = false;
}
}
catch (Exception e)
{
m_log.ErrorFormat("[Content Management]: Exception thrown while reading parameters from configuration file. Message: " + e);
m_enabled = false;
}
m_enabled = source.Configs["CMS"].GetBoolean("Enabled", false);
databaseDir = source.Configs["CMS"].GetString("Directory", databaseDir);
database = source.Configs["CMS"].GetString("Database", database);
channel = source.Configs["CMS"].GetInt("Channel", channel);
if (!m_enabled)
{
m_log.Info("[Content Management]: Content Management System is not Enabled.");
return;
}
if (database != "FileSystemDatabase" && database != "GitDatabase")
{
m_log.ErrorFormat("[Content Management]: The Database attribute must be defined as either FileSystemDatabase or GitDatabase");
m_enabled = false;
}
}
catch (Exception e)
{
m_log.ErrorFormat("[Content Management]: Exception thrown while reading parameters from configuration file. Message: " + e);
m_enabled = false;
}
lock(this)
{
if (!initialised) //only init once
{
m_view = new CMView();
m_model = new CMModel();
m_control = new CMController(m_model, m_view, scene, channel);
m_model.Initialise(database);
m_view.Initialise(m_model);
if (!m_enabled)
{
m_log.Info("[Content Management]: Content Management System is not Enabled.");
return;
}
initialised = true;
m_model.InitialiseDatabase(scene, databaseDir);
}
else
{
m_model.InitialiseDatabase(scene, databaseDir);
m_control.RegisterNewRegion(scene);
}
}
}
lock(this)
{
if (!initialised) //only init once
{
m_view = new CMView();
m_model = new CMModel();
m_control = new CMController(m_model, m_view, scene, channel);
m_model.Initialise(database);
m_view.Initialise(m_model);
initialised = true;
m_model.InitialiseDatabase(scene, databaseDir);
}
else
{
m_model.InitialiseDatabase(scene, databaseDir);
m_control.RegisterNewRegion(scene);
}
}
}
public void PostInitialise()
{
if (! m_enabled)
return;
if (! m_enabled)
return;
lock(this)
{
if (!m_posted) //only post once
{
m_model.PostInitialise();
m_posted = true;
}
}
}
lock(this)
{
if (!m_posted) //only post once
{
m_model.PostInitialise();
m_posted = true;
}
}
}
public void Close()
public void Close()
{}
public string Name
@ -107,5 +107,5 @@ namespace OpenSim.Region.Environment.Modules.ContentManagement
{
get { return true; }
}
}
}
}