minor: Add some console feedback on region restart and log who requested a region restart if done from the viewer.

connector_plugin
Justin Clark-Casey (justincc) 2012-11-23 03:05:30 +00:00
parent 8c8c8a00a4
commit 9b60c14bb1
2 changed files with 9 additions and 1 deletions

View File

@ -271,6 +271,10 @@ namespace OpenSim.Region.CoreModules.World.Estate
} }
restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true); restartModule.ScheduleRestart(UUID.Zero, "Region will restart in {0}", times.ToArray(), true);
m_log.InfoFormat(
"User {0} requested restart of region {1} in {2} seconds",
remoteClient.Name, Scene.Name, times.Count != 0 ? times[0] : 0);
} }
} }

View File

@ -26,6 +26,7 @@
*/ */
using System; using System;
using System.Linq;
using System.Reflection; using System.Reflection;
using System.Timers; using System.Timers;
using System.Threading; using System.Threading;
@ -264,7 +265,10 @@ namespace OpenSim.Region.CoreModules.World.Region
for (int i = 4 ; i < args.Length ; i++) for (int i = 4 ; i < args.Length ; i++)
times.Add(Convert.ToInt32(args[i])); times.Add(Convert.ToInt32(args[i]));
MainConsole.Instance.OutputFormat(
"Region {0} scheduled for restart in {1} seconds", m_Scene.Name, times.Sum());
ScheduleRestart(UUID.Zero, args[3], times.ToArray(), notice); ScheduleRestart(UUID.Zero, args[3], times.ToArray(), notice);
} }
} }
} }