OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add the ability to abort a pending restart using the viewer UI or a 

RemoteAdmin message
avinationmerge
Melanie 2012-01-28 22:19:10 +01:00
parent 498fe1afe7
commit 7c824f02b4
3 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
View File

@ -263,6 +263,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
Scene rebootedScene = null; Scene rebootedScene = null;
GetSceneFromRegionParams(requestData, responseData, out rebootedScene); GetSceneFromRegionParams(requestData, responseData, out rebootedScene);
IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>();
responseData["success"] = false; responseData["success"] = false;
responseData["accepted"] = true; responseData["accepted"] = true;
responseData["rebooting"] = true; responseData["rebooting"] = true;
@ -273,6 +275,23 @@ namespace OpenSim.ApplicationPlugins.RemoteController
if (requestData.ContainsKey("alerts")) if (requestData.ContainsKey("alerts"))
{ {
string[] alertTimes = requestData["alerts"].ToString().Split( new char[] {','}); string[] alertTimes = requestData["alerts"].ToString().Split( new char[] {','});
if (alertTimes.Length == 1 && Convert.ToInt32(alertTimes[0]) == -1)
{
if (restartModule != null)
{
message = "Restart has been cancelled";
if (requestData.ContainsKey("message"))
message = requestData["message"].ToString();
restartModule.AbortRestart(message);
responseData["success"] = true;
responseData["rebooting"] = false;
return;
}
}
foreach (string a in alertTimes) foreach (string a in alertTimes)
times.Add(Convert.ToInt32(a)); times.Add(Convert.ToInt32(a));
} }
@ -305,7 +324,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
notice = false; notice = false;
} }
IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>();
if (restartModule != null) if (restartModule != null)
{ {
restartModule.ScheduleRestart(UUID.Zero, message, times.ToArray(), notice); restartModule.ScheduleRestart(UUID.Zero, message, times.ToArray(), notice);

6
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
View File

@ -256,6 +256,12 @@ namespace OpenSim.Region.CoreModules.World.Estate
IRestartModule restartModule = Scene.RequestModuleInterface<IRestartModule>(); IRestartModule restartModule = Scene.RequestModuleInterface<IRestartModule>();
if (restartModule != null) if (restartModule != null)
{ {
if (timeInSeconds == -1)
{
restartModule.AbortRestart("Restart aborted by region manager");
return;
}
List<int> times = new List<int>(); List<int> times = new List<int>();
while (timeInSeconds > 0) while (timeInSeconds > 0)
{ {

3
OpenSim/Region/CoreModules/World/Region/RestartModule.cs
View File

@ -240,6 +240,9 @@ namespace OpenSim.Region.CoreModules.World.Region
if (m_DialogModule != null && message != String.Empty) if (m_DialogModule != null && message != String.Empty)
m_DialogModule.SendGeneralAlert(message); m_DialogModule.SendGeneralAlert(message);
} }
if (m_MarkerPath != String.Empty)
File.Delete(Path.Combine(m_MarkerPath,
m_Scene.RegionInfo.RegionID.ToString()));
} }
private void HandleRegionRestart(string module, string[] args) private void HandleRegionRestart(string module, string[] args)