Adding some more SNMP events and some refactoring
Signed : The Masqued Foxiavinationmerge
							parent
							
								
									7eda9364fd
								
							
						
					
					
						commit
						85646b157c
					
				|  | @ -355,7 +355,7 @@ namespace OpenSim | |||
| 
 | ||||
|             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 | ||||
|  | @ -363,7 +363,7 @@ namespace OpenSim | |||
|              | ||||
|             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 | ||||
|  | @ -375,8 +375,8 @@ namespace OpenSim | |||
|              | ||||
|             if (scene.SnmpService != null) | ||||
|             { | ||||
|                 scene.SnmpService.Warning("Grid Registration in progress", scene); | ||||
|             } | ||||
|                 scene.SnmpService.BootInfo("Grid Registration in progress", scene); | ||||
|             }  | ||||
|             try | ||||
|             { | ||||
|                 scene.RegisterRegionWithGrid(); | ||||
|  | @ -396,7 +396,7 @@ namespace OpenSim | |||
| 
 | ||||
|             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 | ||||
|  | @ -408,7 +408,7 @@ namespace OpenSim | |||
| 
 | ||||
|             if (scene.SnmpService != null) | ||||
|             { | ||||
|                 scene.SnmpService.Warning("ScriptEngine started", scene); | ||||
|                 scene.SnmpService.BootInfo("ScriptEngine started", scene); | ||||
|             } | ||||
| 
 | ||||
|             m_sceneManager.Add(scene); | ||||
|  | @ -421,7 +421,7 @@ namespace OpenSim | |||
| 
 | ||||
|             if (scene.SnmpService != null) | ||||
|             { | ||||
|                 scene.SnmpService.Warning("Initializing region modules", scene); | ||||
|                 scene.SnmpService.BootInfo("Initializing region modules", scene); | ||||
|             } | ||||
|             if (do_post_init) | ||||
|             { | ||||
|  | @ -436,7 +436,7 @@ namespace OpenSim | |||
| 
 | ||||
|             if (scene.SnmpService != null) | ||||
|             { | ||||
|                 scene.SnmpService.Warning("The region is operational", scene); | ||||
|                 scene.SnmpService.BootInfo("The region is operational", scene); | ||||
|                 scene.SnmpService.LinkUp(scene); | ||||
|             } | ||||
| 
 | ||||
|  | @ -448,6 +448,11 @@ namespace OpenSim | |||
|         private void ShutdownRegion(Scene scene) | ||||
|         { | ||||
|             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; | ||||
|             if (ApplicationRegistry.TryGet<IRegionModulesController>(out controller)) | ||||
|             { | ||||
|  |  | |||
|  | @ -20,4 +20,5 @@ public interface ISnmpModule | |||
| 	// | ||||
|     void LinkUp(Scene scene); | ||||
|     void LinkDown(Scene scene); | ||||
|     void BootInfo(string data, Scene scene); | ||||
| } | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 sacha
						sacha