aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-11-08 00:31:26 +0000
committerJustin Clark-Casey (justincc)2013-11-08 00:31:26 +0000
commit5cef8bf64ec3725788ca0ceb70395f8389e52e7c (patch)
treedb8901b81d34f13bde55d826fbc855783878b9c3
parentupdate OpenMetaverse.dll to 7ae74674a09877119cbb4c80cbffea474e20da29 (diff)
downloadopensim-SC_OLD-5cef8bf64ec3725788ca0ceb70395f8389e52e7c.zip
opensim-SC_OLD-5cef8bf64ec3725788ca0ceb70395f8389e52e7c.tar.gz
opensim-SC_OLD-5cef8bf64ec3725788ca0ceb70395f8389e52e7c.tar.bz2
opensim-SC_OLD-5cef8bf64ec3725788ca0ceb70395f8389e52e7c.tar.xz
Make admin_save_oar request submit a request ID and log this for tracking.
Previous behaviour of always logging 'name' is unhelpful since this actually an error message parameter which is only filled out if an error has occurred
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs18
1 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index c78cf3b..8b66ee1 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -1408,7 +1408,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1408 /// </remarks> 1408 /// </remarks>
1409 private void XmlRpcSaveOARMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient) 1409 private void XmlRpcSaveOARMethod(XmlRpcRequest request, XmlRpcResponse response, IPEndPoint remoteClient)
1410 { 1410 {
1411 m_log.Info("[RADMIN]: Received Save OAR Administrator Request"); 1411 m_log.Info("[RADMIN]: Received Save OAR Request");
1412 1412
1413 Hashtable responseData = (Hashtable)response.Value; 1413 Hashtable responseData = (Hashtable)response.Value;
1414 Hashtable requestData = (Hashtable)request.Params[0]; 1414 Hashtable requestData = (Hashtable)request.Params[0];
@@ -1454,8 +1454,14 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1454 1454
1455 if (archiver != null) 1455 if (archiver != null)
1456 { 1456 {
1457 Guid requestId = Guid.NewGuid();
1457 scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted; 1458 scene.EventManager.OnOarFileSaved += RemoteAdminOarSaveCompleted;
1458 archiver.ArchiveRegion(filename, options); 1459
1460 m_log.InfoFormat(
1461 "[RADMIN]: Submitting save OAR request for {0} to file {1}, request ID {2}",
1462 scene.Name, filename, requestId);
1463
1464 archiver.ArchiveRegion(filename, requestId, options);
1459 1465
1460 lock (m_saveOarLock) 1466 lock (m_saveOarLock)
1461 Monitor.Wait(m_saveOarLock,5000); 1467 Monitor.Wait(m_saveOarLock,5000);
@@ -1476,12 +1482,16 @@ namespace OpenSim.ApplicationPlugins.RemoteController
1476 throw e; 1482 throw e;
1477 } 1483 }
1478 1484
1479 m_log.Info("[RADMIN]: Save OAR Administrator Request complete"); 1485 m_log.Info("[RADMIN]: Save OAR Request complete");
1480 } 1486 }
1481 1487
1482 private void RemoteAdminOarSaveCompleted(Guid uuid, string name) 1488 private void RemoteAdminOarSaveCompleted(Guid uuid, string name)
1483 { 1489 {
1484 m_log.DebugFormat("[RADMIN]: File processing complete for {0}", name); 1490 if (name != "")
1491 m_log.ErrorFormat("[RADMIN]: Saving of OAR file with request ID {0} failed with message {1}", uuid, name);
1492 else
1493 m_log.DebugFormat("[RADMIN]: Saved OAR file for request {0}", uuid);
1494
1485 lock (m_saveOarLock) 1495 lock (m_saveOarLock)
1486 Monitor.Pulse(m_saveOarLock); 1496 Monitor.Pulse(m_saveOarLock);
1487 } 1497 }