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

Merge branch 'careminster' into careminster-presence-refactor

avinationmerge
Melanie 2010-04-27 03:58:43 +01:00
parent 89a003c6fc 85646b157c
commit 8a32ee7dd2
2 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
OpenSim/Region/Application/OpenSimBase.cs
View File

@ -347,14 +347,12 @@ namespace OpenSim
if (scene.SnmpService != null) if (scene.SnmpService != null)
{ {
scene.SnmpService.ColdStart(1,scene); scene.SnmpService.ColdStart(1,scene);
scene.SnmpService.LinkDown(scene);
} }
// it should be a LinkDown event
// Maped inside opennms
// bad...
if (scene.SnmpService != null) if (scene.SnmpService != null)
{ {
scene.SnmpService.Warning("Loading prins", scene); scene.SnmpService.BootInfo("Loading prins", scene);
} }
// Prims have to be loaded after module configuration since some modules may be invoked during the load // Prims have to be loaded after module configuration since some modules may be invoked during the load
@ -362,7 +360,7 @@ namespace OpenSim
if (scene.SnmpService != null) if (scene.SnmpService != null)
{ {
scene.SnmpService.Warning("Creating region texture", scene); scene.SnmpService.BootInfo("Creating region texture", scene);
} }
// moved these here as the terrain texture has to be created after the modules are initialized // moved these here as the terrain texture has to be created after the modules are initialized
@ -374,8 +372,8 @@ namespace OpenSim
if (scene.SnmpService != null) if (scene.SnmpService != null)
{ {
scene.SnmpService.Warning("Grid Registration in progress", scene); scene.SnmpService.BootInfo("Grid Registration in progress", scene);
} }
try try
{ {
scene.RegisterRegionWithGrid(); scene.RegisterRegionWithGrid();
@ -395,7 +393,7 @@ namespace OpenSim
if (scene.SnmpService != null) if (scene.SnmpService != null)
{ {
scene.SnmpService.Warning("Grid Registration done", scene); scene.SnmpService.BootInfo("Grid Registration done", scene);
} }
// We need to do this after we've initialized the // We need to do this after we've initialized the
@ -407,7 +405,7 @@ namespace OpenSim
if (scene.SnmpService != null) if (scene.SnmpService != null)
{ {
scene.SnmpService.Warning("ScriptEngine started", scene); scene.SnmpService.BootInfo("ScriptEngine started", scene);
} }
m_sceneManager.Add(scene); m_sceneManager.Add(scene);
@ -420,7 +418,7 @@ namespace OpenSim
if (scene.SnmpService != null) if (scene.SnmpService != null)
{ {
scene.SnmpService.Warning("Initializing region modules", scene); scene.SnmpService.BootInfo("Initializing region modules", scene);
} }
if (do_post_init) if (do_post_init)
{ {
@ -435,7 +433,8 @@ namespace OpenSim
if (scene.SnmpService != null) if (scene.SnmpService != null)
{ {
scene.SnmpService.Warning("The region is operational", scene); scene.SnmpService.BootInfo("The region is operational", scene);
scene.SnmpService.LinkUp(scene);
} }
scene.StartTimer(); scene.StartTimer();
@ -446,6 +445,11 @@ namespace OpenSim
private void ShutdownRegion(Scene scene) private void ShutdownRegion(Scene scene)
{ {
m_log.DebugFormat("[SHUTDOWN]: Shutting down region {0}", scene.RegionInfo.RegionName); m_log.DebugFormat("[SHUTDOWN]: Shutting down region {0}", scene.RegionInfo.RegionName);
if (scene.SnmpService != null)
{
scene.SnmpService.BootInfo("The region is shutting down", scene);
scene.SnmpService.LinkDown(scene);
}
IRegionModulesController controller; IRegionModulesController controller;
if (ApplicationRegistry.TryGet<IRegionModulesController>(out controller)) if (ApplicationRegistry.TryGet<IRegionModulesController>(out controller))
{ {

6
OpenSim/Region/Framework/Interfaces/ISnmpModule.cs
View File

@ -15,4 +15,10 @@ public interface ISnmpModule
void Major(string Message, Scene scene); void Major(string Message, Scene scene);
void ColdStart(int step , Scene scene); void ColdStart(int step , Scene scene);
void Shutdown(int step , Scene scene); void Shutdown(int step , Scene scene);
//
// Node Start/stop events
//
void LinkUp(Scene scene);
void LinkDown(Scene scene);
void BootInfo(string data, Scene scene);
} }