From 5cb8127e8745d6d89f9b748fecefbeb8a43da60e Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Mon, 23 Mar 2015 22:16:49 +0100 Subject: [PATCH] Make log output of remote admin's restart region call reflect restart cancellations properly. --- .../RemoteController/RemoteAdminPlugin.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs index 2120116ce9..e71e81c804 100644 --- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs +++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs @@ -271,8 +271,6 @@ namespace OpenSim.ApplicationPlugins.RemoteController try { - m_log.Info("[RADMIN]: Request to restart Region."); - Scene rebootedScene = null; bool restartAll = false; @@ -307,6 +305,8 @@ namespace OpenSim.ApplicationPlugins.RemoteController string[] alertTimes = requestData["alerts"].ToString().Split( new char[] {','}); if (alertTimes.Length == 1 && Convert.ToInt32(alertTimes[0]) == -1) { + m_log.Info("[RADMIN]: Request to cancel restart."); + if (restartModule != null) { 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."; if (requestData.ContainsKey("message"))