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

Fix up remote controller.

avinationmerge
Melanie 2010-11-25 03:43:23 +00:00
parent 6c3eb21440
commit e74b0deb4e
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,18 +216,41 @@ namespace OpenSim.ApplicationPlugins.RemoteController
if (!m_application.SceneManager.TryGetScene(regionID, out rebootedScene)) if (!m_application.SceneManager.TryGetScene(regionID, out rebootedScene))
throw new Exception("region not found"); throw new Exception("region not found");
int timeout = 30;
string message; string message;
List<int> times = new List<int>();
if (requestData.ContainsKey("restart") if (requestData.ContainsKey("alerts"))
&& ((string)requestData["restart"] == "delayed")
&& requestData.ContainsKey("milliseconds"))
{ {
timeout = Int32.Parse(requestData["milliseconds"].ToString()) / 1000; string[] alertTimes = requestData["alerts"].ToString().Split( new char[] {','});
foreach (string a in alertTimes)
times.Add(Convert.ToInt32(a));
}
else
{
int timeout = 30;
if (requestData.ContainsKey("milliseconds"))
timeout = Int32.Parse(requestData["milliseconds"].ToString()) / 1000;
while (timeout > 0)
{
times.Add(timeout);
if (timeout > 300)
timeout -= 120;
else if (timeout > 30)
timeout -= 30;
else
timeout -= 15;
}
} }
if (requestData.ContainsKey("restart")
&& ((string)requestData["restart"] == "delayed"))
message = "Region is restarting in {0}. Please save what you are doing and log out."; message = "Region is restarting in {0}. Please save what you are doing and log out.";
if (requestData.ContainsKey("message"))
message = requestData["message"].ToString();
bool notice = true; bool notice = true;
if (requestData.ContainsKey("noticetype") if (requestData.ContainsKey("noticetype")
&& ((string)requestData["noticetype"] == "dialog")) && ((string)requestData["noticetype"] == "dialog"))
@ -240,9 +263,7 @@ namespace OpenSim.ApplicationPlugins.RemoteController
IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>(); IRestartModule restartModule = rebootedScene.RequestModuleInterface<IRestartModule>();
if (restartModule != null) if (restartModule != null)
{ {
List<int> times = new List<int> { 30, 15 }; restartModule.ScheduleRestart(UUID.Zero, message, times.ToArray(), notice);
restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), notice);
responseData["success"] = true; responseData["success"] = true;
} }
response.Value = responseData; response.Value = responseData;