diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | 37 |
1 files changed, 30 insertions, 7 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 6465db2..329a489 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs | |||
@@ -48,6 +48,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
48 | { | 48 | { |
49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 49 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
50 | 50 | ||
51 | private static Object rslock = new Object(); | ||
52 | |||
51 | private OpenSimBase m_app; | 53 | private OpenSimBase m_app; |
52 | private BaseHttpServer m_httpd; | 54 | private BaseHttpServer m_httpd; |
53 | private IConfig m_config; | 55 | private IConfig m_config; |
@@ -186,6 +188,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
186 | response.Value = responseData; | 188 | response.Value = responseData; |
187 | } | 189 | } |
188 | 190 | ||
191 | m_log.Info("[RADMIN]: Restart Region request complete"); | ||
189 | return response; | 192 | return response; |
190 | } | 193 | } |
191 | 194 | ||
@@ -194,6 +197,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
194 | XmlRpcResponse response = new XmlRpcResponse(); | 197 | XmlRpcResponse response = new XmlRpcResponse(); |
195 | Hashtable responseData = new Hashtable(); | 198 | Hashtable responseData = new Hashtable(); |
196 | 199 | ||
200 | m_log.Info("[RADMIN]: Alert request started"); | ||
201 | |||
197 | try | 202 | try |
198 | { | 203 | { |
199 | Hashtable requestData = (Hashtable) request.Params[0]; | 204 | Hashtable requestData = (Hashtable) request.Params[0]; |
@@ -230,6 +235,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
230 | response.Value = responseData; | 235 | response.Value = responseData; |
231 | } | 236 | } |
232 | 237 | ||
238 | m_log.Info("[RADMIN]: Alert request complete"); | ||
233 | return response; | 239 | return response; |
234 | } | 240 | } |
235 | 241 | ||
@@ -238,6 +244,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
238 | XmlRpcResponse response = new XmlRpcResponse(); | 244 | XmlRpcResponse response = new XmlRpcResponse(); |
239 | Hashtable responseData = new Hashtable(); | 245 | Hashtable responseData = new Hashtable(); |
240 | 246 | ||
247 | m_log.Info("[RADMIN]: Load height maps request started"); | ||
248 | |||
241 | try | 249 | try |
242 | { | 250 | { |
243 | Hashtable requestData = (Hashtable) request.Params[0]; | 251 | Hashtable requestData = (Hashtable) request.Params[0]; |
@@ -283,12 +291,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
283 | responseData["error"] = e.Message; | 291 | responseData["error"] = e.Message; |
284 | } | 292 | } |
285 | 293 | ||
294 | m_log.Info("[RADMIN]: Load height maps request complete"); | ||
295 | |||
286 | return response; | 296 | return response; |
287 | } | 297 | } |
288 | 298 | ||
289 | public XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request) | 299 | public XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request) |
290 | { | 300 | { |
301 | |||
291 | m_log.Info("[RADMIN]: Received Shutdown Administrator Request"); | 302 | m_log.Info("[RADMIN]: Received Shutdown Administrator Request"); |
303 | |||
292 | XmlRpcResponse response = new XmlRpcResponse(); | 304 | XmlRpcResponse response = new XmlRpcResponse(); |
293 | Hashtable responseData = new Hashtable(); | 305 | Hashtable responseData = new Hashtable(); |
294 | 306 | ||
@@ -347,6 +359,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
347 | 359 | ||
348 | response.Value = responseData; | 360 | response.Value = responseData; |
349 | } | 361 | } |
362 | m_log.Info("[RADMIN]: Shutdown Administrator Request complete"); | ||
350 | return response; | 363 | return response; |
351 | } | 364 | } |
352 | 365 | ||
@@ -433,7 +446,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
433 | XmlRpcResponse response = new XmlRpcResponse(); | 446 | XmlRpcResponse response = new XmlRpcResponse(); |
434 | Hashtable responseData = new Hashtable(); | 447 | Hashtable responseData = new Hashtable(); |
435 | 448 | ||
436 | lock (this) | 449 | lock (rslock) |
437 | { | 450 | { |
438 | int m_regionLimit = m_config.GetInt("region_limit", 0); | 451 | int m_regionLimit = m_config.GetInt("region_limit", 0); |
439 | 452 | ||
@@ -605,6 +618,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
605 | 618 | ||
606 | response.Value = responseData; | 619 | response.Value = responseData; |
607 | } | 620 | } |
621 | m_log.Info("[RADMIN]: CreateRegion: request complete"); | ||
608 | return response; | 622 | return response; |
609 | } | 623 | } |
610 | } | 624 | } |
@@ -641,7 +655,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
641 | XmlRpcResponse response = new XmlRpcResponse(); | 655 | XmlRpcResponse response = new XmlRpcResponse(); |
642 | Hashtable responseData = new Hashtable(); | 656 | Hashtable responseData = new Hashtable(); |
643 | 657 | ||
644 | lock (this) | 658 | lock (rslock) |
645 | { | 659 | { |
646 | try | 660 | try |
647 | { | 661 | { |
@@ -671,6 +685,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
671 | response.Value = responseData; | 685 | response.Value = responseData; |
672 | } | 686 | } |
673 | 687 | ||
688 | m_log.Info("[RADMIN]: DeleteRegion: request complete"); | ||
674 | return response; | 689 | return response; |
675 | } | 690 | } |
676 | } | 691 | } |
@@ -719,7 +734,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
719 | XmlRpcResponse response = new XmlRpcResponse(); | 734 | XmlRpcResponse response = new XmlRpcResponse(); |
720 | Hashtable responseData = new Hashtable(); | 735 | Hashtable responseData = new Hashtable(); |
721 | 736 | ||
722 | lock (this) | 737 | lock (rslock) |
723 | { | 738 | { |
724 | try | 739 | try |
725 | { | 740 | { |
@@ -779,6 +794,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
779 | 794 | ||
780 | response.Value = responseData; | 795 | response.Value = responseData; |
781 | } | 796 | } |
797 | m_log.Info("[RADMIN]: CreateUser: request complete"); | ||
782 | return response; | 798 | return response; |
783 | } | 799 | } |
784 | } | 800 | } |
@@ -852,6 +868,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
852 | response.Value = responseData; | 868 | response.Value = responseData; |
853 | } | 869 | } |
854 | 870 | ||
871 | m_log.Info("[RADMIN]: UserExists: request complete"); | ||
855 | return response; | 872 | return response; |
856 | } | 873 | } |
857 | 874 | ||
@@ -899,7 +916,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
899 | XmlRpcResponse response = new XmlRpcResponse(); | 916 | XmlRpcResponse response = new XmlRpcResponse(); |
900 | Hashtable responseData = new Hashtable(); | 917 | Hashtable responseData = new Hashtable(); |
901 | 918 | ||
902 | lock (this) | 919 | lock (rslock) |
903 | { | 920 | { |
904 | try | 921 | try |
905 | { | 922 | { |
@@ -1002,6 +1019,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1002 | } | 1019 | } |
1003 | } | 1020 | } |
1004 | 1021 | ||
1022 | m_log.Info("[RADMIN]: UpdateUserAccount: request complete"); | ||
1005 | return response; | 1023 | return response; |
1006 | } | 1024 | } |
1007 | 1025 | ||
@@ -1043,7 +1061,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1043 | XmlRpcResponse response = new XmlRpcResponse(); | 1061 | XmlRpcResponse response = new XmlRpcResponse(); |
1044 | Hashtable responseData = new Hashtable(); | 1062 | Hashtable responseData = new Hashtable(); |
1045 | 1063 | ||
1046 | lock (this) | 1064 | lock (rslock) |
1047 | { | 1065 | { |
1048 | try | 1066 | try |
1049 | { | 1067 | { |
@@ -1099,6 +1117,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1099 | response.Value = responseData; | 1117 | response.Value = responseData; |
1100 | } | 1118 | } |
1101 | 1119 | ||
1120 | m_log.Info("[RADMIN]: Load OAR Administrator Request complete"); | ||
1102 | return response; | 1121 | return response; |
1103 | } | 1122 | } |
1104 | } | 1123 | } |
@@ -1195,6 +1214,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1195 | response.Value = responseData; | 1214 | response.Value = responseData; |
1196 | } | 1215 | } |
1197 | 1216 | ||
1217 | m_log.Info("[RADMIN]: Save OAR Administrator Request complete"); | ||
1198 | return response; | 1218 | return response; |
1199 | } | 1219 | } |
1200 | 1220 | ||
@@ -1204,7 +1224,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1204 | XmlRpcResponse response = new XmlRpcResponse(); | 1224 | XmlRpcResponse response = new XmlRpcResponse(); |
1205 | Hashtable responseData = new Hashtable(); | 1225 | Hashtable responseData = new Hashtable(); |
1206 | 1226 | ||
1207 | lock (this) | 1227 | lock (rslock) |
1208 | { | 1228 | { |
1209 | try | 1229 | try |
1210 | { | 1230 | { |
@@ -1277,6 +1297,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1277 | response.Value = responseData; | 1297 | response.Value = responseData; |
1278 | } | 1298 | } |
1279 | 1299 | ||
1300 | m_log.Info("[RADMIN]: Load XML Administrator Request complete"); | ||
1280 | return response; | 1301 | return response; |
1281 | } | 1302 | } |
1282 | } | 1303 | } |
@@ -1360,6 +1381,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1360 | response.Value = responseData; | 1381 | response.Value = responseData; |
1361 | } | 1382 | } |
1362 | 1383 | ||
1384 | m_log.Info("[RADMIN]: Save XML Administrator Request complete"); | ||
1363 | return response; | 1385 | return response; |
1364 | } | 1386 | } |
1365 | 1387 | ||
@@ -1415,6 +1437,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1415 | response.Value = responseData; | 1437 | response.Value = responseData; |
1416 | } | 1438 | } |
1417 | 1439 | ||
1440 | m_log.Info("[RADMIN]: Query XML Administrator Request complete"); | ||
1418 | return response; | 1441 | return response; |
1419 | } | 1442 | } |
1420 | 1443 | ||
@@ -1422,4 +1445,4 @@ namespace OpenSim.ApplicationPlugins.RemoteController | |||
1422 | { | 1445 | { |
1423 | } | 1446 | } |
1424 | } | 1447 | } |
1425 | } \ No newline at end of file | 1448 | } |