aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/ConfigurationMember.cs4
-rwxr-xr-xOpenSim/Framework/Console/ConsoleBase.cs86
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/Console/ConsoleUtil.cs20
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/Console/LocalConsole.cs15
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/Console/MockConsole.cs14
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/Console/RemoteConsole.cs16
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/IConsole.cs17
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/Monitoring/ChecksManager.cs2
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/Monitoring/StatsLogger.cs4
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/Monitoring/StatsManager.cs10
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/Monitoring/WorkManager.cs18
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/PluginManager.cs6
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/RegionInfo.cs14
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/Servers/MainServer.cs12
-rwxr-xr-x[-rw-r--r--]OpenSim/Framework/Servers/ServerBase.cs12
15 files changed, 93 insertions, 157 deletions
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index 7afa68a..32c6a3e 100644..100755
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -262,14 +262,14 @@ namespace OpenSim.Framework
262 if (configurationDescription.Trim() != String.Empty) 262 if (configurationDescription.Trim() != String.Empty)
263 { 263 {
264 console_result = 264 console_result =
265 MainConsole.Instance.CmdPrompt( 265 MainConsole.Instance.Prompt(
266 configurationDescription + ": " + configOption.configurationQuestion, 266 configurationDescription + ": " + configOption.configurationQuestion,
267 configOption.configurationDefault); 267 configOption.configurationDefault);
268 } 268 }
269 else 269 else
270 { 270 {
271 console_result = 271 console_result =
272 MainConsole.Instance.CmdPrompt(configOption.configurationQuestion, 272 MainConsole.Instance.Prompt(configOption.configurationQuestion,
273 configOption.configurationDefault); 273 configOption.configurationDefault);
274 } 274 }
275 } 275 }
diff --git a/OpenSim/Framework/Console/ConsoleBase.cs b/OpenSim/Framework/Console/ConsoleBase.cs
index 64cddea..56bda05 100755
--- a/OpenSim/Framework/Console/ConsoleBase.cs
+++ b/OpenSim/Framework/Console/ConsoleBase.cs
@@ -35,13 +35,13 @@ using log4net;
35 35
36namespace OpenSim.Framework.Console 36namespace OpenSim.Framework.Console
37{ 37{
38 public class ConsoleBase 38 public class ConsoleBase : IConsole
39 { 39 {
40// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 40// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
41 41
42 protected string prompt = "# "; 42 protected string prompt = "# ";
43 43
44 public object ConsoleScene { get; set; } 44 public IScene ConsoleScene { get; set; }
45 45
46 public string DefaultPrompt { get; set; } 46 public string DefaultPrompt { get; set; }
47 47
@@ -58,78 +58,39 @@ namespace OpenSim.Framework.Console
58 { 58 {
59 } 59 }
60 60
61 public virtual void Output(string text, string level) 61 public virtual void Output(string format, string level = null, params object[] components)
62 { 62 {
63 Output(text); 63 System.Console.WriteLine(format, components);
64 } 64 }
65 65
66 public virtual void Output(string text) 66 public virtual string Prompt(string p, string def = null, List<char> excludedCharacters = null, bool echo = true)
67 {
68 System.Console.WriteLine(text);
69 }
70
71 public virtual void OutputFormat(string format, params object[] components)
72 {
73 Output(string.Format(format, components));
74 }
75
76 public string CmdPrompt(string p)
77 {
78 return ReadLine(String.Format("{0}: ", p), false, true);
79 }
80
81 public string CmdPrompt(string p, string def)
82 {
83 string ret = ReadLine(String.Format("{0} [{1}]: ", p, def), false, true);
84 if (ret == String.Empty)
85 ret = def;
86
87 return ret;
88 }
89
90 public string CmdPrompt(string p, List<char> excludedCharacters)
91 { 67 {
92 bool itisdone = false; 68 bool itisdone = false;
93 string ret = String.Empty; 69 string ret = String.Empty;
94 while (!itisdone) 70 while (!itisdone)
95 { 71 {
96 itisdone = true; 72 itisdone = true;
97 ret = CmdPrompt(p);
98 73
99 foreach (char c in excludedCharacters) 74 if (def != null)
100 { 75 ret = ReadLine(String.Format("{0}: ", p), false, echo);
101 if (ret.Contains(c.ToString())) 76 else
102 { 77 ret = ReadLine(String.Format("{0} [{1}]: ", p, def), false, echo);
103 System.Console.WriteLine("The character \"" + c.ToString() + "\" is not permitted.");
104 itisdone = false;
105 }
106 }
107 }
108
109 return ret;
110 }
111
112 public string CmdPrompt(string p, string def, List<char> excludedCharacters)
113 {
114 bool itisdone = false;
115 string ret = String.Empty;
116 while (!itisdone)
117 {
118 itisdone = true;
119 ret = CmdPrompt(p, def);
120 78
121 if (ret == String.Empty) 79 if (ret == String.Empty && def != null)
122 { 80 {
123 ret = def; 81 ret = def;
124 } 82 }
125 else 83 else
126 { 84 {
127 foreach (char c in excludedCharacters) 85 if (excludedCharacters != null)
128 { 86 {
129 if (ret.Contains(c.ToString())) 87 foreach (char c in excludedCharacters)
130 { 88 {
131 System.Console.WriteLine("The character \"" + c.ToString() + "\" is not permitted."); 89 if (ret.Contains(c.ToString()))
132 itisdone = false; 90 {
91 System.Console.WriteLine("The character \"" + c.ToString() + "\" is not permitted.");
92 itisdone = false;
93 }
133 } 94 }
134 } 95 }
135 } 96 }
@@ -139,14 +100,14 @@ namespace OpenSim.Framework.Console
139 } 100 }
140 101
141 // Displays a command prompt and returns a default value, user may only enter 1 of 2 options 102 // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
142 public string CmdPrompt(string prompt, string defaultresponse, List<string> options) 103 public virtual string Prompt(string prompt, string defaultresponse, List<string> options)
143 { 104 {
144 bool itisdone = false; 105 bool itisdone = false;
145 string optstr = String.Empty; 106 string optstr = String.Empty;
146 foreach (string s in options) 107 foreach (string s in options)
147 optstr += " " + s; 108 optstr += " " + s;
148 109
149 string temp = CmdPrompt(prompt, defaultresponse); 110 string temp = Prompt(prompt, defaultresponse);
150 while (itisdone == false) 111 while (itisdone == false)
151 { 112 {
152 if (options.Contains(temp)) 113 if (options.Contains(temp))
@@ -156,19 +117,12 @@ namespace OpenSim.Framework.Console
156 else 117 else
157 { 118 {
158 System.Console.WriteLine("Valid options are" + optstr); 119 System.Console.WriteLine("Valid options are" + optstr);
159 temp = CmdPrompt(prompt, defaultresponse); 120 temp = Prompt(prompt, defaultresponse);
160 } 121 }
161 } 122 }
162 return temp; 123 return temp;
163 } 124 }
164 125
165 // Displays a prompt and waits for the user to enter a string, then returns that string
166 // (Done with no echo and suitable for passwords)
167 public string PasswdPrompt(string p)
168 {
169 return ReadLine(String.Format("{0}: ", p), false, false);
170 }
171
172 public virtual string ReadLine(string p, bool isCommand, bool e) 126 public virtual string ReadLine(string p, bool isCommand, bool e)
173 { 127 {
174 System.Console.Write("{0}", p); 128 System.Console.Write("{0}", p);
diff --git a/OpenSim/Framework/Console/ConsoleUtil.cs b/OpenSim/Framework/Console/ConsoleUtil.cs
index bfa05a2..5342a29 100644..100755
--- a/OpenSim/Framework/Console/ConsoleUtil.cs
+++ b/OpenSim/Framework/Console/ConsoleUtil.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.Console
75 { 75 {
76 if (File.Exists(path)) 76 if (File.Exists(path))
77 { 77 {
78 console.OutputFormat("File {0} already exists. Please move or remove it.", path); 78 console.Output("File {0} already exists. Please move or remove it.", null, path);
79 return false; 79 return false;
80 } 80 }
81 81
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.Console
97 if (!UUID.TryParse(rawUuid, out uuid)) 97 if (!UUID.TryParse(rawUuid, out uuid))
98 { 98 {
99 if (console != null) 99 if (console != null)
100 console.OutputFormat("ERROR: {0} is not a valid uuid", rawUuid); 100 console.Output("ERROR: {0} is not a valid uuid", null, rawUuid);
101 101
102 return false; 102 return false;
103 } 103 }
@@ -110,7 +110,7 @@ namespace OpenSim.Framework.Console
110 if (!uint.TryParse(rawLocalId, out localId)) 110 if (!uint.TryParse(rawLocalId, out localId))
111 { 111 {
112 if (console != null) 112 if (console != null)
113 console.OutputFormat("ERROR: {0} is not a valid local id", localId); 113 console.Output("ERROR: {0} is not a valid local id", null, localId);
114 114
115 return false; 115 return false;
116 } 116 }
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.Console
118 if (localId == 0) 118 if (localId == 0)
119 { 119 {
120 if (console != null) 120 if (console != null)
121 console.OutputFormat("ERROR: {0} is not a valid local id - it must be greater than 0", localId); 121 console.Output("ERROR: {0} is not a valid local id - it must be greater than 0", null, localId);
122 122
123 return false; 123 return false;
124 } 124 }
@@ -150,7 +150,7 @@ namespace OpenSim.Framework.Console
150 } 150 }
151 151
152 if (console != null) 152 if (console != null)
153 console.OutputFormat("ERROR: {0} is not a valid UUID or local id", rawId); 153 console.Output("ERROR: {0} is not a valid UUID or local id", null, rawId);
154 154
155 return false; 155 return false;
156 } 156 }
@@ -167,7 +167,7 @@ namespace OpenSim.Framework.Console
167 if (!bool.TryParse(rawConsoleString, out b)) 167 if (!bool.TryParse(rawConsoleString, out b))
168 { 168 {
169 if (console != null) 169 if (console != null)
170 console.OutputFormat("ERROR: {0} is not a true or false value", rawConsoleString); 170 console.Output("ERROR: {0} is not a true or false value", null, rawConsoleString);
171 171
172 return false; 172 return false;
173 } 173 }
@@ -187,7 +187,7 @@ namespace OpenSim.Framework.Console
187 if (!int.TryParse(rawConsoleInt, out i)) 187 if (!int.TryParse(rawConsoleInt, out i))
188 { 188 {
189 if (console != null) 189 if (console != null)
190 console.OutputFormat("ERROR: {0} is not a valid integer", rawConsoleInt); 190 console.Output("ERROR: {0} is not a valid integer", null, rawConsoleInt);
191 191
192 return false; 192 return false;
193 } 193 }
@@ -207,7 +207,7 @@ namespace OpenSim.Framework.Console
207 if (!float.TryParse(rawConsoleInput, out i)) 207 if (!float.TryParse(rawConsoleInput, out i))
208 { 208 {
209 if (console != null) 209 if (console != null)
210 console.OutputFormat("ERROR: {0} is not a valid float", rawConsoleInput); 210 console.Output("ERROR: {0} is not a valid float", null, rawConsoleInput);
211 211
212 return false; 212 return false;
213 } 213 }
@@ -227,7 +227,7 @@ namespace OpenSim.Framework.Console
227 if (!double.TryParse(rawConsoleInput, out i)) 227 if (!double.TryParse(rawConsoleInput, out i))
228 { 228 {
229 if (console != null) 229 if (console != null)
230 console.OutputFormat("ERROR: {0} is not a valid double", rawConsoleInput); 230 console.Output("ERROR: {0} is not a valid double", null, rawConsoleInput);
231 231
232 return false; 232 return false;
233 } 233 }
@@ -249,7 +249,7 @@ namespace OpenSim.Framework.Console
249 if (i < 0) 249 if (i < 0)
250 { 250 {
251 if (console != null) 251 if (console != null)
252 console.OutputFormat("ERROR: {0} is not a positive integer", rawConsoleInt); 252 console.Output("ERROR: {0} is not a positive integer", null, rawConsoleInt);
253 253
254 return false; 254 return false;
255 } 255 }
diff --git a/OpenSim/Framework/Console/LocalConsole.cs b/OpenSim/Framework/Console/LocalConsole.cs
index ba32f50..55c5c7e 100644..100755
--- a/OpenSim/Framework/Console/LocalConsole.cs
+++ b/OpenSim/Framework/Console/LocalConsole.cs
@@ -359,7 +359,7 @@ namespace OpenSim.Framework.Console
359 { 359 {
360 string outText = text; 360 string outText = text;
361 361
362 if (level != LOGLEVEL_NONE) 362 if (level != null)
363 { 363 {
364 MatchCollection matches = m_categoryRegex.Matches(text); 364 MatchCollection matches = m_categoryRegex.Matches(text);
365 365
@@ -389,20 +389,15 @@ namespace OpenSim.Framework.Console
389 System.Console.WriteLine(); 389 System.Console.WriteLine();
390 } 390 }
391 391
392 public override void Output(string text) 392 public override void Output(string format, string level = null, params object[] components)
393 { 393 {
394 Output(text, LOGLEVEL_NONE); 394 FireOnOutput(format);
395 }
396
397 public override void Output(string text, string level)
398 {
399 FireOnOutput(text);
400 395
401 lock (m_commandLine) 396 lock (m_commandLine)
402 { 397 {
403 if (m_cursorYPosition == -1) 398 if (m_cursorYPosition == -1)
404 { 399 {
405 WriteLocalText(text, level); 400 WriteLocalText(format, level);
406 401
407 return; 402 return;
408 } 403 }
@@ -418,7 +413,7 @@ namespace OpenSim.Framework.Console
418 m_cursorYPosition = SetCursorTop(m_cursorYPosition); 413 m_cursorYPosition = SetCursorTop(m_cursorYPosition);
419 SetCursorLeft(0); 414 SetCursorLeft(0);
420 415
421 WriteLocalText(text, level); 416 WriteLocalText(format, level);
422 417
423 m_cursorYPosition = System.Console.CursorTop; 418 m_cursorYPosition = System.Console.CursorTop;
424 419
diff --git a/OpenSim/Framework/Console/MockConsole.cs b/OpenSim/Framework/Console/MockConsole.cs
index e1ff720..d68b066 100644..100755
--- a/OpenSim/Framework/Console/MockConsole.cs
+++ b/OpenSim/Framework/Console/MockConsole.cs
@@ -56,21 +56,17 @@ namespace OpenSim.Framework.Console
56 56
57 public string ReadLine(string p, bool isCommand, bool e) { return ""; } 57 public string ReadLine(string p, bool isCommand, bool e) { return ""; }
58 58
59 public object ConsoleScene { 59 public IScene ConsoleScene {
60 get { return null; } 60 get { return null; }
61 set {} 61 set {}
62 } 62 }
63 63
64 public void Output(string text, string level) {} 64 public void Output(string format, string level, params object[] components) {}
65 public void Output(string text) {}
66 public void OutputFormat(string format, params object[] components) {}
67 65
68 public string CmdPrompt(string p) { return ""; } 66 public string Prompt(string p) { return ""; }
69 public string CmdPrompt(string p, string def) { return ""; } 67 public string Prompt(string p, string def, List<char> excludedCharacters, bool echo) { return ""; }
70 public string CmdPrompt(string p, List<char> excludedCharacters) { return ""; }
71 public string CmdPrompt(string p, string def, List<char> excludedCharacters) { return ""; }
72 68
73 public string CmdPrompt(string prompt, string defaultresponse, List<string> options) { return ""; } 69 public string Prompt(string prompt, string defaultresponse, List<string> options) { return ""; }
74 70
75 public string PasswdPrompt(string p) { return ""; } 71 public string PasswdPrompt(string p) { return ""; }
76 } 72 }
diff --git a/OpenSim/Framework/Console/RemoteConsole.cs b/OpenSim/Framework/Console/RemoteConsole.cs
index b90b75f..16b4636 100644..100755
--- a/OpenSim/Framework/Console/RemoteConsole.cs
+++ b/OpenSim/Framework/Console/RemoteConsole.cs
@@ -188,13 +188,19 @@ namespace OpenSim.Framework.Console
188 m_Server.AddHTTPHandler("/SessionCommand/", HandleHttpSessionCommand); 188 m_Server.AddHTTPHandler("/SessionCommand/", HandleHttpSessionCommand);
189 } 189 }
190 190
191 public override void Output(string text, string level) 191 public override void Output(string format, string level = null, params object[] components)
192 { 192 {
193 Output(text, level, false, false, false); 193 if (components.Length == 0)
194 Output(format, level, false, false, false);
195 else
196 Output(String.Format(format, components), level, false, false, false);
194 } 197 }
195 198
196 protected void Output(string text, string level, bool isPrompt, bool isCommand, bool isInput) 199 protected void Output(string text, string level, bool isPrompt, bool isCommand, bool isInput)
197 { 200 {
201 if (level == null)
202 level = String.Empty;
203
198 // Increment the line number. It was 0 and they start at 1 204 // Increment the line number. It was 0 and they start at 1
199 // so we need to pre-increment. 205 // so we need to pre-increment.
200 m_lineNumber++; 206 m_lineNumber++;
@@ -228,12 +234,6 @@ namespace OpenSim.Framework.Console
228 System.Console.WriteLine(text.Trim()); 234 System.Console.WriteLine(text.Trim());
229 } 235 }
230 236
231 public override void Output(string text)
232 {
233 // Output plain (non-logging style) text.
234 Output(text, String.Empty, false, false, false);
235 }
236
237 public override string ReadLine(string p, bool isCommand, bool e) 237 public override string ReadLine(string p, bool isCommand, bool e)
238 { 238 {
239 // Output the prompt an prepare to wait. This 239 // Output the prompt an prepare to wait. This
diff --git a/OpenSim/Framework/IConsole.cs b/OpenSim/Framework/IConsole.cs
index 79560d8..963e07f 100644..100755
--- a/OpenSim/Framework/IConsole.cs
+++ b/OpenSim/Framework/IConsole.cs
@@ -32,22 +32,13 @@ namespace OpenSim.Framework
32{ 32{
33 public interface IConsole 33 public interface IConsole
34 { 34 {
35 object ConsoleScene { get; set; } 35 IScene ConsoleScene { get; set; }
36 36
37 void Output(string text, string level); 37 void Output(string format, string level = null, params object[] components);
38 void Output(string text);
39 void OutputFormat(string format, params object[] components);
40 38
41 string CmdPrompt(string p); 39 string Prompt(string p, string def = null, List<char> excludedCharacters = null, bool echo = true);
42 string CmdPrompt(string p, string def);
43 string CmdPrompt(string p, List<char> excludedCharacters);
44 string CmdPrompt(string p, string def, List<char> excludedCharacters);
45 40
46 // Displays a command prompt and returns a default value, user may only enter 1 of 2 options 41 // Displays a command prompt and returns a default value, user may only enter 1 of 2 options
47 string CmdPrompt(string prompt, string defaultresponse, List<string> options); 42 string Prompt(string prompt, string defaultresponse, List<string> options);
48
49 // Displays a prompt and waits for the user to enter a string, then returns that string
50 // (Done with no echo and suitable for passwords)
51 string PasswdPrompt(string p);
52 } 43 }
53} \ No newline at end of file 44} \ No newline at end of file
diff --git a/OpenSim/Framework/Monitoring/ChecksManager.cs b/OpenSim/Framework/Monitoring/ChecksManager.cs
index ff3b041..100b748 100644..100755
--- a/OpenSim/Framework/Monitoring/ChecksManager.cs
+++ b/OpenSim/Framework/Monitoring/ChecksManager.cs
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.Monitoring
88 con.Output("check categories available are:"); 88 con.Output("check categories available are:");
89 89
90 foreach (string category in RegisteredChecks.Keys) 90 foreach (string category in RegisteredChecks.Keys)
91 con.OutputFormat(" {0}", category); 91 con.Output(" {0}", null, category);
92 } 92 }
93// else 93// else
94// { 94// {
diff --git a/OpenSim/Framework/Monitoring/StatsLogger.cs b/OpenSim/Framework/Monitoring/StatsLogger.cs
index b719af9..4369b36 100644..100755
--- a/OpenSim/Framework/Monitoring/StatsLogger.cs
+++ b/OpenSim/Framework/Monitoring/StatsLogger.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Monitoring
79 if (cmd[2] == "start") 79 if (cmd[2] == "start")
80 { 80 {
81 Start(); 81 Start();
82 con.OutputFormat("Now recording all stats to file every {0}ms", m_statsLogIntervalMs); 82 con.Output("Now recording all stats to file every {0}ms", null, m_statsLogIntervalMs);
83 } 83 }
84 else if (cmd[2] == "stop") 84 else if (cmd[2] == "stop")
85 { 85 {
@@ -106,7 +106,7 @@ namespace OpenSim.Framework.Monitoring
106 sw.WriteLine(line); 106 sw.WriteLine(line);
107 } 107 }
108 108
109 MainConsole.Instance.OutputFormat("Stats saved to file {0}", path); 109 MainConsole.Instance.Output("Stats saved to file {0}", null, path);
110 } 110 }
111 111
112 public static void Start() 112 public static void Start()
diff --git a/OpenSim/Framework/Monitoring/StatsManager.cs b/OpenSim/Framework/Monitoring/StatsManager.cs
index a6b341f..57b9474 100644..100755
--- a/OpenSim/Framework/Monitoring/StatsManager.cs
+++ b/OpenSim/Framework/Monitoring/StatsManager.cs
@@ -117,14 +117,14 @@ namespace OpenSim.Framework.Monitoring
117 { 117 {
118 con.Output("Statistic categories available are:"); 118 con.Output("Statistic categories available are:");
119 foreach (string category in RegisteredStats.Keys) 119 foreach (string category in RegisteredStats.Keys)
120 con.OutputFormat(" {0}", category); 120 con.Output(" {0}", null, category);
121 } 121 }
122 else 122 else
123 { 123 {
124 SortedDictionary<string, SortedDictionary<string, Stat>> category; 124 SortedDictionary<string, SortedDictionary<string, Stat>> category;
125 if (!RegisteredStats.TryGetValue(categoryName, out category)) 125 if (!RegisteredStats.TryGetValue(categoryName, out category))
126 { 126 {
127 con.OutputFormat("No such category as {0}", categoryName); 127 con.Output("No such category as {0}", null, categoryName);
128 } 128 }
129 else 129 else
130 { 130 {
@@ -150,14 +150,14 @@ namespace OpenSim.Framework.Monitoring
150 } 150 }
151 else 151 else
152 { 152 {
153 con.OutputFormat( 153 con.Output(
154 "No such stat {0} in {1}.{2}", statName, categoryName, containerName); 154 "No such stat {0} in {1}.{2}", null, statName, categoryName, containerName);
155 } 155 }
156 } 156 }
157 } 157 }
158 else 158 else
159 { 159 {
160 con.OutputFormat("No such container {0} in category {1}", containerName, categoryName); 160 con.Output("No such container {0} in category {1}", null, containerName, categoryName);
161 } 161 }
162 } 162 }
163 } 163 }
diff --git a/OpenSim/Framework/Monitoring/WorkManager.cs b/OpenSim/Framework/Monitoring/WorkManager.cs
index c6d97e1..f6e0799 100644..100755
--- a/OpenSim/Framework/Monitoring/WorkManager.cs
+++ b/OpenSim/Framework/Monitoring/WorkManager.cs
@@ -215,23 +215,23 @@ namespace OpenSim.Framework.Monitoring
215 if (subCommand == "stop") 215 if (subCommand == "stop")
216 { 216 {
217 JobEngine.Stop(); 217 JobEngine.Stop();
218 MainConsole.Instance.OutputFormat("Stopped job engine."); 218 MainConsole.Instance.Output("Stopped job engine.");
219 } 219 }
220 else if (subCommand == "start") 220 else if (subCommand == "start")
221 { 221 {
222 JobEngine.Start(); 222 JobEngine.Start();
223 MainConsole.Instance.OutputFormat("Started job engine."); 223 MainConsole.Instance.Output("Started job engine.");
224 } 224 }
225 else if (subCommand == "status") 225 else if (subCommand == "status")
226 { 226 {
227 MainConsole.Instance.OutputFormat("Job engine running: {0}", JobEngine.IsRunning); 227 MainConsole.Instance.Output("Job engine running: {0}", null, JobEngine.IsRunning);
228 228
229 JobEngine.Job job = JobEngine.CurrentJob; 229 JobEngine.Job job = JobEngine.CurrentJob;
230 MainConsole.Instance.OutputFormat("Current job {0}", job != null ? job.Name : "none"); 230 MainConsole.Instance.Output("Current job {0}", null, job != null ? job.Name : "none");
231 231
232 MainConsole.Instance.OutputFormat( 232 MainConsole.Instance.Output(
233 "Jobs waiting: {0}", JobEngine.IsRunning ? JobEngine.JobsWaiting.ToString() : "n/a"); 233 "Jobs waiting: {0}", null, JobEngine.IsRunning ? JobEngine.JobsWaiting.ToString() : "n/a");
234 MainConsole.Instance.OutputFormat("Log Level: {0}", JobEngine.LogLevel); 234 MainConsole.Instance.Output("Log Level: {0}", null, JobEngine.LogLevel);
235 } 235 }
236 else if (subCommand == "log") 236 else if (subCommand == "log")
237 { 237 {
@@ -246,12 +246,12 @@ namespace OpenSim.Framework.Monitoring
246 // if (ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, args[4], out logLevel)) 246 // if (ConsoleUtil.TryParseConsoleInt(MainConsole.Instance, args[4], out logLevel))
247 // { 247 // {
248 JobEngine.LogLevel = logLevel; 248 JobEngine.LogLevel = logLevel;
249 MainConsole.Instance.OutputFormat("Set debug log level to {0}", JobEngine.LogLevel); 249 MainConsole.Instance.Output("Set debug log level to {0}", null, JobEngine.LogLevel);
250 // } 250 // }
251 } 251 }
252 else 252 else
253 { 253 {
254 MainConsole.Instance.OutputFormat("Unrecognized job engine subcommand {0}", subCommand); 254 MainConsole.Instance.Output("Unrecognized job engine subcommand {0}", null, subCommand);
255 } 255 }
256 } 256 }
257 } 257 }
diff --git a/OpenSim/Framework/PluginManager.cs b/OpenSim/Framework/PluginManager.cs
index 0c94fcb..c5e860d 100644..100755
--- a/OpenSim/Framework/PluginManager.cs
+++ b/OpenSim/Framework/PluginManager.cs
@@ -129,7 +129,7 @@ namespace OpenSim.Framework
129 } 129 }
130 130
131 Addin addin = addins[ndx]; 131 Addin addin = addins[ndx];
132 MainConsole.Instance.OutputFormat("Uninstalling plugin {0}", addin.Id); 132 MainConsole.Instance.Output("Uninstalling plugin {0}", null, addin.Id);
133 AddinManager.Registry.DisableAddin(addin.Id); 133 AddinManager.Registry.DisableAddin(addin.Id);
134 addin.Enabled = false; 134 addin.Enabled = false;
135 IProgressStatus ps = new ConsoleProgressStatus(false); 135 IProgressStatus ps = new ConsoleProgressStatus(false);
@@ -487,7 +487,7 @@ namespace OpenSim.Framework
487 } 487 }
488 else 488 else
489 { 489 {
490 MainConsole.Instance.OutputFormat("Not Enabled in this domain {0}", addin.Name); 490 MainConsole.Instance.Output("Not Enabled in this domain {0}", null, addin.Name);
491 } 491 }
492 return; 492 return;
493 } 493 }
@@ -503,7 +503,7 @@ namespace OpenSim.Framework
503 503
504 foreach (Addin addin in addins) 504 foreach (Addin addin in addins)
505 { 505 {
506 MainConsole.Instance.OutputFormat("Addin {0}", addin.Name); 506 MainConsole.Instance.Output("Addin {0}", null, addin.Name);
507 } 507 }
508 } 508 }
509 509
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 98ef5d5..5a3b814 100644..100755
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -528,7 +528,7 @@ namespace OpenSim.Framework
528 { 528 {
529 while (name.Trim() == string.Empty) 529 while (name.Trim() == string.Empty)
530 { 530 {
531 name = MainConsole.Instance.CmdPrompt("New region name", name); 531 name = MainConsole.Instance.Prompt("New region name", name);
532 if (name.Trim() == string.Empty) 532 if (name.Trim() == string.Empty)
533 { 533 {
534 MainConsole.Instance.Output("Cannot interactively create region with no name"); 534 MainConsole.Instance.Output("Cannot interactively create region with no name");
@@ -570,7 +570,7 @@ namespace OpenSim.Framework
570 UUID newID = UUID.Random(); 570 UUID newID = UUID.Random();
571 while (RegionID == UUID.Zero) 571 while (RegionID == UUID.Zero)
572 { 572 {
573 regionUUID = MainConsole.Instance.CmdPrompt("RegionUUID", newID.ToString()); 573 regionUUID = MainConsole.Instance.Prompt("RegionUUID", newID.ToString());
574 if (!UUID.TryParse(regionUUID.Trim(), out RegionID)) 574 if (!UUID.TryParse(regionUUID.Trim(), out RegionID))
575 { 575 {
576 MainConsole.Instance.Output("RegionUUID must be a valid UUID"); 576 MainConsole.Instance.Output("RegionUUID must be a valid UUID");
@@ -587,7 +587,7 @@ namespace OpenSim.Framework
587 string location = config.GetString("Location", String.Empty); 587 string location = config.GetString("Location", String.Empty);
588 if (location == String.Empty) 588 if (location == String.Empty)
589 { 589 {
590 location = MainConsole.Instance.CmdPrompt("Region Location", "1000,1000"); 590 location = MainConsole.Instance.Prompt("Region Location", "1000,1000");
591 config.Set("Location", location); 591 config.Set("Location", location);
592 } 592 }
593 593
@@ -623,7 +623,7 @@ namespace OpenSim.Framework
623 } 623 }
624 else 624 else
625 { 625 {
626 address = IPAddress.Parse(MainConsole.Instance.CmdPrompt("Internal IP address", "0.0.0.0")); 626 address = IPAddress.Parse(MainConsole.Instance.Prompt("Internal IP address", "0.0.0.0"));
627 config.Set("InternalAddress", address.ToString()); 627 config.Set("InternalAddress", address.ToString());
628 } 628 }
629 629
@@ -637,7 +637,7 @@ namespace OpenSim.Framework
637 } 637 }
638 else 638 else
639 { 639 {
640 port = Convert.ToInt32(MainConsole.Instance.CmdPrompt("Internal port", "9000")); 640 port = Convert.ToInt32(MainConsole.Instance.Prompt("Internal port", "9000"));
641 config.Set("InternalPort", port); 641 config.Set("InternalPort", port);
642 } 642 }
643 m_internalEndPoint = new IPEndPoint(address, port); 643 m_internalEndPoint = new IPEndPoint(address, port);
@@ -652,7 +652,7 @@ namespace OpenSim.Framework
652 else 652 else
653 { 653 {
654 if (creatingNew) 654 if (creatingNew)
655 m_resolveAddress = Convert.ToBoolean(MainConsole.Instance.CmdPrompt("Resolve hostname to IP on start (for running inside Docker)", "False")); 655 m_resolveAddress = Convert.ToBoolean(MainConsole.Instance.Prompt("Resolve hostname to IP on start (for running inside Docker)", "False"));
656 656
657 config.Set("ResolveAddress", m_resolveAddress.ToString()); 657 config.Set("ResolveAddress", m_resolveAddress.ToString());
658 } 658 }
@@ -667,7 +667,7 @@ namespace OpenSim.Framework
667 } 667 }
668 else 668 else
669 { 669 {
670 externalName = MainConsole.Instance.CmdPrompt("External host name", "SYSTEMIP"); 670 externalName = MainConsole.Instance.Prompt("External host name", "SYSTEMIP");
671 config.Set("ExternalHostName", externalName); 671 config.Set("ExternalHostName", externalName);
672 } 672 }
673 if (externalName == "SYSTEMIP") 673 if (externalName == "SYSTEMIP")
diff --git a/OpenSim/Framework/Servers/MainServer.cs b/OpenSim/Framework/Servers/MainServer.cs
index 48a3a82..f4662fe 100644..100755
--- a/OpenSim/Framework/Servers/MainServer.cs
+++ b/OpenSim/Framework/Servers/MainServer.cs
@@ -192,35 +192,35 @@ namespace OpenSim.Framework.Servers
192 192
193 if (!int.TryParse(rawNewDebug, out newDebug)) 193 if (!int.TryParse(rawNewDebug, out newDebug))
194 { 194 {
195 MainConsole.Instance.OutputFormat("{0} is not a valid debug level", rawNewDebug); 195 MainConsole.Instance.Output("{0} is not a valid debug level", null, rawNewDebug);
196 return; 196 return;
197 } 197 }
198 198
199 if (newDebug < 0 || newDebug > 6) 199 if (newDebug < 0 || newDebug > 6)
200 { 200 {
201 MainConsole.Instance.OutputFormat("{0} is outside the valid debug level range of 0..6", newDebug); 201 MainConsole.Instance.Output("{0} is outside the valid debug level range of 0..6", null, newDebug);
202 return; 202 return;
203 } 203 }
204 204
205 if (allReqs || inReqs) 205 if (allReqs || inReqs)
206 { 206 {
207 MainServer.DebugLevel = newDebug; 207 MainServer.DebugLevel = newDebug;
208 MainConsole.Instance.OutputFormat("IN debug level set to {0}", newDebug); 208 MainConsole.Instance.Output("IN debug level set to {0}", null, newDebug);
209 } 209 }
210 210
211 if (allReqs || outReqs) 211 if (allReqs || outReqs)
212 { 212 {
213 WebUtil.DebugLevel = newDebug; 213 WebUtil.DebugLevel = newDebug;
214 MainConsole.Instance.OutputFormat("OUT debug level set to {0}", newDebug); 214 MainConsole.Instance.Output("OUT debug level set to {0}", null, newDebug);
215 } 215 }
216 } 216 }
217 else 217 else
218 { 218 {
219 if (allReqs || inReqs) 219 if (allReqs || inReqs)
220 MainConsole.Instance.OutputFormat("Current IN debug level is {0}", MainServer.DebugLevel); 220 MainConsole.Instance.Output("Current IN debug level is {0}", null, DebugLevel);
221 221
222 if (allReqs || outReqs) 222 if (allReqs || outReqs)
223 MainConsole.Instance.OutputFormat("Current OUT debug level is {0}", WebUtil.DebugLevel); 223 MainConsole.Instance.Output("Current OUT debug level is {0}", null, WebUtil.DebugLevel);
224 } 224 }
225 } 225 }
226 226
diff --git a/OpenSim/Framework/Servers/ServerBase.cs b/OpenSim/Framework/Servers/ServerBase.cs
index 858098c..78341d4 100644..100755
--- a/OpenSim/Framework/Servers/ServerBase.cs
+++ b/OpenSim/Framework/Servers/ServerBase.cs
@@ -492,18 +492,18 @@ namespace OpenSim.Framework.Servers
492 492
493 if (!int.TryParse(rawLevel, out newLevel)) 493 if (!int.TryParse(rawLevel, out newLevel))
494 { 494 {
495 MainConsole.Instance.OutputFormat("{0} is not a valid debug level", rawLevel); 495 MainConsole.Instance.Output("{0} is not a valid debug level", null, rawLevel);
496 return; 496 return;
497 } 497 }
498 498
499 if (newLevel < 0 || newLevel > Util.MAX_THREADPOOL_LEVEL) 499 if (newLevel < 0 || newLevel > Util.MAX_THREADPOOL_LEVEL)
500 { 500 {
501 MainConsole.Instance.OutputFormat("{0} is outside the valid debug level range of 0.." + Util.MAX_THREADPOOL_LEVEL, newLevel); 501 MainConsole.Instance.Output("{0} is outside the valid debug level range of 0.." + Util.MAX_THREADPOOL_LEVEL, null, newLevel);
502 return; 502 return;
503 } 503 }
504 504
505 Util.LogThreadPool = newLevel; 505 Util.LogThreadPool = newLevel;
506 MainConsole.Instance.OutputFormat("LogThreadPool set to {0}", newLevel); 506 MainConsole.Instance.Output("LogThreadPool set to {0}", null, newLevel);
507 } 507 }
508 508
509 private void HandleForceGc(string module, string[] args) 509 private void HandleForceGc(string module, string[] args)
@@ -991,9 +991,9 @@ namespace OpenSim.Framework.Servers
991 } 991 }
992 992
993 if (Watchdog.AbortThread(threadId)) 993 if (Watchdog.AbortThread(threadId))
994 MainConsole.Instance.OutputFormat("Aborted thread with id {0}", threadId); 994 MainConsole.Instance.Output("Aborted thread with id {0}", null, threadId);
995 else 995 else
996 MainConsole.Instance.OutputFormat("ERROR - Thread with id {0} not found in managed threads", threadId); 996 MainConsole.Instance.Output("ERROR - Thread with id {0} not found in managed threads", null, threadId);
997 } 997 }
998 998
999 /// <summary> 999 /// <summary>
@@ -1020,7 +1020,7 @@ namespace OpenSim.Framework.Servers
1020 protected void Notice(string format, params object[] components) 1020 protected void Notice(string format, params object[] components)
1021 { 1021 {
1022 if (m_console != null) 1022 if (m_console != null)
1023 m_console.OutputFormat(format, components); 1023 m_console.Output(format, null, components);
1024 } 1024 }
1025 1025
1026 public virtual void Shutdown() 1026 public virtual void Shutdown()
generated by cgit v1.1 at 2025-02-27 14:07:17 +0000