aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Application
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Application')
-rw-r--r--OpenSim/Region/Application/OpenSim.cs27
1 files changed, 24 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSim.cs b/OpenSim/Region/Application/OpenSim.cs
index ca6a2a3..c04b8c2 100644
--- a/OpenSim/Region/Application/OpenSim.cs
+++ b/OpenSim/Region/Application/OpenSim.cs
@@ -67,6 +67,8 @@ namespace OpenSim
67 67
68 IConfig startupConfig = m_config.Source.Configs["Startup"]; 68 IConfig startupConfig = m_config.Source.Configs["Startup"];
69 69
70 Util.SetMaxThreads(startupConfig.GetInt("MaxPoolThreads", 15));
71
70 if (startupConfig != null) 72 if (startupConfig != null)
71 { 73 {
72 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "startup_commands.txt"); 74 m_startupCommandsFile = startupConfig.GetString("startup_console_commands_file", "startup_commands.txt");
@@ -90,10 +92,17 @@ namespace OpenSim
90 appender.File = fileName; 92 appender.File = fileName;
91 appender.ActivateOptions(); 93 appender.ActivateOptions();
92 } 94 }
93 m_log.InfoFormat("[LOGGING] Logging started to file {0}", appender.File); 95 m_log.InfoFormat("[LOGGING]: Logging started to file {0}", appender.File);
94 } 96 }
95 } 97 }
98
99 string asyncCallMethodStr = startupConfig.GetString("async_call_method", String.Empty);
100 FireAndForgetMethod asyncCallMethod;
101 if (!String.IsNullOrEmpty(asyncCallMethodStr) && Utils.EnumTryParse<FireAndForgetMethod>(asyncCallMethodStr, out asyncCallMethod))
102 Util.FireAndForgetMethod = asyncCallMethod;
96 } 103 }
104
105 m_log.Info("[OPENSIM MAIN]: Using async_call_method " + Util.FireAndForgetMethod);
97 } 106 }
98 107
99 /// <summary> 108 /// <summary>
@@ -628,8 +637,20 @@ namespace OpenSim
628 break; 637 break;
629 638
630 case "save": 639 case "save":
631 m_log.Info("Saving configuration file: " + Application.iniFilePath); 640 if (cmdparams.Length < 2)
632 m_config.Save(Application.iniFilePath); 641 {
642 m_log.Error("SYNTAX: " + n + " SAVE FILE");
643 return;
644 }
645
646 if (Application.iniFilePath == cmdparams[1])
647 {
648 m_log.Error("FILE can not be "+Application.iniFilePath);
649 return;
650 }
651
652 m_log.Info("Saving configuration file: " + cmdparams[1]);
653 m_config.Save(cmdparams[1]);
633 break; 654 break;
634 } 655 }
635 } 656 }