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

Make log output of remote admin's restart region call reflect restart cancellations properly.

avinationmerge
Melanie Thielker 2015-03-23 22:16:49 +01:00
parent 97ff01a0c2
commit 5cb8127e87
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -271,8 +271,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController
try try
{ {
m_log.Info("[RADMIN]: Request to restart Region.");
Scene rebootedScene = null; Scene rebootedScene = null;
bool restartAll = false; bool restartAll = false;
@ -307,6 +305,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
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 (alertTimes.Length == 1 && Convert.ToInt32(alertTimes[0]) == -1)
{ {
m_log.Info("[RADMIN]: Request to cancel restart.");
if (restartModule != null) if (restartModule != null)
{ {
message = "Restart has been cancelled"; message = "Restart has been cancelled";
@ -342,6 +342,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController
} }
} }
m_log.Info("[RADMIN]: Request to restart Region.");
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")) if (requestData.ContainsKey("message"))