fixed a timing bug in config re-read. Apparently there is 1000000000 ns in one second...
parent
2db5de3e72
commit
785b641272
|
@ -720,8 +720,8 @@ namespace OpenSim
|
||||||
m_log.Error("show modules - shows info aboutloaded modules.");
|
m_log.Error("show modules - shows info aboutloaded modules.");
|
||||||
m_log.Error("stats - statistical information for this server not displayed in the client");
|
m_log.Error("stats - statistical information for this server not displayed in the client");
|
||||||
m_log.Error("shutdown - disconnect all clients and shutdown.");
|
m_log.Error("shutdown - disconnect all clients and shutdown.");
|
||||||
m_log.Error("config set category field value - set a config value");
|
m_log.Error("config set section field value - set a config value");
|
||||||
m_log.Error("config get category field - get a config value");
|
m_log.Error("config get section field - get a config value");
|
||||||
m_log.Error("config save - save OpenSim.ini");
|
m_log.Error("config save - save OpenSim.ini");
|
||||||
m_log.Error("terrain help - show help for terrain commands.");
|
m_log.Error("terrain help - show help for terrain commands.");
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -90,12 +90,12 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
|
||||||
m_ScriptEngine.Log.Warn(m_ScriptEngine.ScriptEngineName,
|
m_ScriptEngine.Log.Warn(m_ScriptEngine.ScriptEngineName,
|
||||||
"Configuration error: MaxEventExecutionTimeMs is less than MaintenanceLoopms. The Maintenance Loop will only check scripts once per run.");
|
"Configuration error: MaxEventExecutionTimeMs is less than MaintenanceLoopms. The Maintenance Loop will only check scripts once per run.");
|
||||||
|
|
||||||
|
long Last_maxFunctionExecutionTimens = 0; // DateTime.Now.Ticks;
|
||||||
|
long Last_ReReadConfigFilens = DateTime.Now.Ticks;
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
long Last_maxFunctionExecutionTimens = 0; // DateTime.Now.Ticks;
|
|
||||||
long Last_ReReadConfigFilens = DateTime.Now.Ticks;
|
|
||||||
while (true)
|
while (true)
|
||||||
{
|
{
|
||||||
System.Threading.Thread.Sleep(MaintenanceLoopms); // Sleep before next pass
|
System.Threading.Thread.Sleep(MaintenanceLoopms); // Sleep before next pass
|
||||||
|
@ -107,11 +107,12 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
|
||||||
//
|
//
|
||||||
// Re-reading config every x seconds
|
// Re-reading config every x seconds
|
||||||
//
|
//
|
||||||
if (m_ScriptEngine.RefreshConfigFileSeconds > 0)
|
if (m_ScriptEngine.RefreshConfigFilens > 0)
|
||||||
{
|
{
|
||||||
// Check if its time to re-read config
|
// Check if its time to re-read config
|
||||||
if (DateTime.Now.Ticks - Last_ReReadConfigFilens > m_ScriptEngine.RefreshConfigFilens)
|
if (DateTime.Now.Ticks - Last_ReReadConfigFilens > m_ScriptEngine.RefreshConfigFilens)
|
||||||
{
|
{
|
||||||
|
//Console.WriteLine("Time passed: " + (DateTime.Now.Ticks - Last_ReReadConfigFilens) + ">" + m_ScriptEngine.RefreshConfigFilens );
|
||||||
// Its time to re-read config file
|
// Its time to re-read config file
|
||||||
m_ScriptEngine.ReadConfig();
|
m_ScriptEngine.ReadConfig();
|
||||||
Last_ReReadConfigFilens = DateTime.Now.Ticks; // Reset time
|
Last_ReReadConfigFilens = DateTime.Now.Ticks; // Reset time
|
||||||
|
|
|
@ -61,10 +61,10 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
|
||||||
/// How many seconds between re-reading config-file. 0 = never. ScriptEngine will try to adjust to new config changes.
|
/// How many seconds between re-reading config-file. 0 = never. ScriptEngine will try to adjust to new config changes.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public int RefreshConfigFileSeconds {
|
public int RefreshConfigFileSeconds {
|
||||||
get { return (int)(RefreshConfigFilens / 10000); }
|
get { return (int)(RefreshConfigFilens / 10000000); }
|
||||||
set { RefreshConfigFilens = value * 10000; }
|
set { RefreshConfigFilens = value * 10000000; }
|
||||||
}
|
}
|
||||||
public long RefreshConfigFilens = 0;
|
public long RefreshConfigFilens;
|
||||||
|
|
||||||
public ScriptManager GetScriptManager()
|
public ScriptManager GetScriptManager()
|
||||||
{
|
{
|
||||||
|
@ -131,9 +131,9 @@ namespace OpenSim.Region.ScriptEngine.Common.ScriptEngineBase
|
||||||
}
|
}
|
||||||
public void ReadConfig()
|
public void ReadConfig()
|
||||||
{
|
{
|
||||||
#if DEBUG
|
//#if DEBUG
|
||||||
Log.Debug(ScriptEngineName, "Refreshing configuration for all modules");
|
// Log.Debug(ScriptEngineName, "Refreshing configuration for all modules");
|
||||||
#endif
|
//#endif
|
||||||
RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 30);
|
RefreshConfigFileSeconds = ScriptConfigSource.GetInt("RefreshConfig", 30);
|
||||||
|
|
||||||
// Reload from disk? No!
|
// Reload from disk? No!
|
||||||
|
|
|
@ -1,10 +1,30 @@
|
||||||
namespace OpenSim._32BitLaunch
|
using System;
|
||||||
|
|
||||||
|
namespace OpenSim._32BitLaunch
|
||||||
{
|
{
|
||||||
class Program
|
class Program
|
||||||
{
|
{
|
||||||
static void Main(string[] args)
|
static void Main(string[] args)
|
||||||
{
|
{
|
||||||
OpenSim.Application.Main(args);
|
System.Console.WriteLine("32-bit OpenSim executor");
|
||||||
|
System.Console.WriteLine("-----------------------");
|
||||||
|
System.Console.WriteLine("");
|
||||||
|
System.Console.WriteLine("This application is compiled for 32-bit CPU and will run under WOW32 or similar.");
|
||||||
|
System.Console.WriteLine("All 64-bit incompatibilities should be gone.");
|
||||||
|
System.Console.WriteLine("");
|
||||||
|
System.Threading.Thread.Sleep(300);
|
||||||
|
try
|
||||||
|
{
|
||||||
|
OpenSim.Application.Main(args);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
System.Console.WriteLine("OpenSim threw an exception:");
|
||||||
|
System.Console.WriteLine(ex.ToString());
|
||||||
|
System.Console.WriteLine("");
|
||||||
|
System.Console.WriteLine("Application will now terminate!");
|
||||||
|
System.Console.WriteLine("");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue