Reorganized some files
parent
d4701d7ecc
commit
323234f82a
|
@ -34,12 +34,12 @@ namespace OpenSim.Grid.ScriptServer
|
||||||
class OpenScript_Main
|
class OpenScript_Main
|
||||||
{
|
{
|
||||||
|
|
||||||
public static ScriptServer SE;
|
public static ScriptServerMain SE;
|
||||||
|
|
||||||
static void Main(string[] args)
|
static void Main(string[] args)
|
||||||
{
|
{
|
||||||
// Application is starting
|
// Application is starting
|
||||||
SE = new ScriptServer();
|
SE = new ScriptServerMain();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
|
@ -1,27 +0,0 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Text;
|
|
||||||
|
|
||||||
namespace OpenSim.Grid.ScriptServer
|
|
||||||
{
|
|
||||||
class ScriptServer
|
|
||||||
{
|
|
||||||
public RegionScriptDaemon RegionScriptDaemon; // Listen for incoming from region
|
|
||||||
public RegionsManager RegionManager; // Handle regions
|
|
||||||
public ScriptEngineLoader ScriptEngineLoader; // Loads scriptengines
|
|
||||||
|
|
||||||
public ScriptServer()
|
|
||||||
{
|
|
||||||
RegionScriptDaemon = new RegionScriptDaemon(this);
|
|
||||||
RegionManager = new RegionsManager(this);
|
|
||||||
//ScriptEngineLoader = new ScriptEngineLoader(this);
|
|
||||||
}
|
|
||||||
|
|
||||||
~ScriptServer()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -37,8 +37,8 @@ namespace OpenSim.Grid.ScriptServer
|
||||||
{
|
{
|
||||||
private Thread listenThread;
|
private Thread listenThread;
|
||||||
|
|
||||||
public ScriptServer m_ScriptServer;
|
public ScriptServerMain m_ScriptServer;
|
||||||
public RegionScriptDaemon(ScriptServer scriptServer)
|
public RegionScriptDaemon(ScriptServerMain scriptServer)
|
||||||
{
|
{
|
||||||
m_ScriptServer = scriptServer;
|
m_ScriptServer = scriptServer;
|
||||||
}
|
}
|
|
@ -9,8 +9,8 @@ namespace OpenSim.Grid.ScriptServer
|
||||||
{
|
{
|
||||||
private List<RegionConnectionManager> Regions = new List<RegionConnectionManager>();
|
private List<RegionConnectionManager> Regions = new List<RegionConnectionManager>();
|
||||||
|
|
||||||
public ScriptServer m_ScriptServer;
|
public ScriptServerMain m_ScriptServer;
|
||||||
public RegionsManager(ScriptServer scriptServer)
|
public RegionsManager(ScriptServerMain scriptServer)
|
||||||
{
|
{
|
||||||
m_ScriptServer = scriptServer;
|
m_ScriptServer = scriptServer;
|
||||||
}
|
}
|
|
@ -0,0 +1,49 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Text;
|
||||||
|
using System.IO;
|
||||||
|
using OpenSim.Framework.Console;
|
||||||
|
using OpenSim.Framework.Utilities;
|
||||||
|
|
||||||
|
namespace OpenSim.Grid.ScriptServer
|
||||||
|
{
|
||||||
|
class ScriptServerMain : conscmd_callback
|
||||||
|
{
|
||||||
|
private readonly string m_logFilename = ("region-console.log");
|
||||||
|
public RegionScriptDaemon RegionScriptDaemon; // Listen for incoming from region
|
||||||
|
public RegionsManager RegionManager; // Handle regions
|
||||||
|
public ScriptEngineLoader ScriptEngineLoader; // Loads scriptengines
|
||||||
|
private LogBase m_log;
|
||||||
|
|
||||||
|
public ScriptServerMain()
|
||||||
|
{
|
||||||
|
m_log = CreateLog();
|
||||||
|
|
||||||
|
RegionScriptDaemon = new RegionScriptDaemon(this);
|
||||||
|
RegionManager = new RegionsManager(this);
|
||||||
|
ScriptEngineLoader = new ScriptEngineLoader(m_log);
|
||||||
|
}
|
||||||
|
|
||||||
|
~ScriptServerMain()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected LogBase CreateLog()
|
||||||
|
{
|
||||||
|
if (!Directory.Exists(Util.logDir()))
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(Util.logDir());
|
||||||
|
}
|
||||||
|
|
||||||
|
return new LogBase((Path.Combine(Util.logDir(), m_logFilename)), "Region", this, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void RunCmd(string command, string[] cmdparams)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
public void Show(string ShowWhat)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue