aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Monitoring
diff options
context:
space:
mode:
Diffstat (limited to '')
-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
4 files changed, 17 insertions, 17 deletions
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 }