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

Adding some more SNMP events and some refactoring 

Signed : The Masqued Foxi
avinationmerge
sacha 2010-04-23 12:40:27 -04:00
parent 7eda9364fd
commit 85646b157c
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -355,7 +355,7 @@ namespace OpenSim
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
@ -363,7 +363,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
@ -375,8 +375,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();
@ -396,7 +396,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
@ -408,7 +408,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);
@ -421,7 +421,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)
{ {
@ -436,7 +436,7 @@ 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.SnmpService.LinkUp(scene);
} }
@ -448,6 +448,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))
{ {

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

@ -20,4 +20,5 @@ public interface ISnmpModule
// //
void LinkUp(Scene scene); void LinkUp(Scene scene);
void LinkDown(Scene scene); void LinkDown(Scene scene);
void BootInfo(string data, Scene scene);
} }