diff options
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index b40aa4b..c3c87e7 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -299,7 +299,7 @@ namespace OpenSim | |||
299 | // Called from base.StartUp() | 299 | // Called from base.StartUp() |
300 | 300 | ||
301 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; | 301 | m_httpServerPort = m_networkServersInfo.HttpListenerPort; |
302 | SceneManager.OnRestartSim += handleRestartRegion; | 302 | SceneManager.OnRestartSim += HandleRestartRegion; |
303 | 303 | ||
304 | // Only enable the watchdogs when all regions are ready. Otherwise we get false positives when cpu is | 304 | // Only enable the watchdogs when all regions are ready. Otherwise we get false positives when cpu is |
305 | // heavily used during initial startup. | 305 | // heavily used during initial startup. |
@@ -735,9 +735,11 @@ namespace OpenSim | |||
735 | } | 735 | } |
736 | } | 736 | } |
737 | 737 | ||
738 | public void handleRestartRegion(RegionInfo whichRegion) | 738 | protected virtual void HandleRestartRegion(RegionInfo whichRegion) |
739 | { | 739 | { |
740 | m_log.Info("[OPENSIM]: Got restart signal from SceneManager"); | 740 | m_log.InfoFormat( |
741 | "[OPENSIM]: Got restart signal from SceneManager for region {0} ({1},{2})", | ||
742 | whichRegion.RegionName, whichRegion.RegionLocX, whichRegion.RegionLocY); | ||
741 | 743 | ||
742 | ShutdownClientServer(whichRegion); | 744 | ShutdownClientServer(whichRegion); |
743 | IScene scene; | 745 | IScene scene; |
@@ -883,7 +885,6 @@ namespace OpenSim | |||
883 | m_log.Info("[SHUTDOWN]: Closing all threads"); | 885 | m_log.Info("[SHUTDOWN]: Closing all threads"); |
884 | m_log.Info("[SHUTDOWN]: Killing listener thread"); | 886 | m_log.Info("[SHUTDOWN]: Killing listener thread"); |
885 | m_log.Info("[SHUTDOWN]: Killing clients"); | 887 | m_log.Info("[SHUTDOWN]: Killing clients"); |
886 | // TODO: implement this | ||
887 | m_log.Info("[SHUTDOWN]: Closing console and terminating"); | 888 | m_log.Info("[SHUTDOWN]: Closing console and terminating"); |
888 | 889 | ||
889 | try | 890 | try |
@@ -892,7 +893,7 @@ namespace OpenSim | |||
892 | } | 893 | } |
893 | catch (Exception e) | 894 | catch (Exception e) |
894 | { | 895 | { |
895 | m_log.ErrorFormat("[SHUTDOWN]: Ignoring failure during shutdown - {0}", e); | 896 | m_log.Error("[SHUTDOWN]: Ignoring failure during shutdown - ", e); |
896 | } | 897 | } |
897 | } | 898 | } |
898 | 899 | ||