diff options
-rw-r--r-- | OpenSim/Region/Application/OpenSimBase.cs | 45 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ISnmpModule.cs | 12 |
2 files changed, 54 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 06ffa91..831269c 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -343,10 +343,28 @@ namespace OpenSim | |||
343 | else m_log.Error("[MODULES]: The new RegionModulesController is missing..."); | 343 | else m_log.Error("[MODULES]: The new RegionModulesController is missing..."); |
344 | 344 | ||
345 | scene.SetModuleInterfaces(); | 345 | scene.SetModuleInterfaces(); |
346 | // First Step of bootreport sequence | ||
347 | if (scene.SnmpService != null) | ||
348 | { | ||
349 | scene.SnmpService.ColdStart(1,scene); | ||
350 | } | ||
351 | |||
352 | // it should be a LinkDown event | ||
353 | // Maped inside opennms | ||
354 | // bad... | ||
355 | if (scene.SnmpService != null) | ||
356 | { | ||
357 | scene.SnmpService.Warning("Loading prins", scene); | ||
358 | } | ||
346 | 359 | ||
347 | // Prims have to be loaded after module configuration since some modules may be invoked during the load | 360 | // Prims have to be loaded after module configuration since some modules may be invoked during the load |
348 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); | 361 | scene.LoadPrimsFromStorage(regionInfo.originRegionID); |
349 | 362 | ||
363 | if (scene.SnmpService != null) | ||
364 | { | ||
365 | scene.SnmpService.Warning("Creating region texture", scene); | ||
366 | } | ||
367 | |||
350 | // moved these here as the terrain texture has to be created after the modules are initialized | 368 | // moved these here as the terrain texture has to be created after the modules are initialized |
351 | // and has to happen before the region is registered with the grid. | 369 | // and has to happen before the region is registered with the grid. |
352 | scene.CreateTerrainTexture(false); | 370 | scene.CreateTerrainTexture(false); |
@@ -354,6 +372,10 @@ namespace OpenSim | |||
354 | // TODO : Try setting resource for region xstats here on scene | 372 | // TODO : Try setting resource for region xstats here on scene |
355 | MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); | 373 | MainServer.Instance.AddStreamHandler(new Region.Framework.Scenes.RegionStatsHandler(regionInfo)); |
356 | 374 | ||
375 | if (scene.SnmpService != null) | ||
376 | { | ||
377 | scene.SnmpService.Warning("Grid Registration in progress", scene); | ||
378 | } | ||
357 | try | 379 | try |
358 | { | 380 | { |
359 | scene.RegisterRegionWithGrid(); | 381 | scene.RegisterRegionWithGrid(); |
@@ -362,11 +384,20 @@ namespace OpenSim | |||
362 | { | 384 | { |
363 | m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e.StackTrace); | 385 | m_log.ErrorFormat("[STARTUP]: Registration of region with grid failed, aborting startup - {0}", e.StackTrace); |
364 | 386 | ||
387 | if (scene.SnmpService != null) | ||
388 | { | ||
389 | scene.SnmpService.Critical("Grid registration failed. Startup aborted.", scene); | ||
390 | } | ||
365 | // Carrying on now causes a lot of confusion down the | 391 | // Carrying on now causes a lot of confusion down the |
366 | // line - we need to get the user's attention | 392 | // line - we need to get the user's attention |
367 | Environment.Exit(1); | 393 | Environment.Exit(1); |
368 | } | 394 | } |
369 | 395 | ||
396 | if (scene.SnmpService != null) | ||
397 | { | ||
398 | scene.SnmpService.Warning("Grid Registration done", scene); | ||
399 | } | ||
400 | |||
370 | // We need to do this after we've initialized the | 401 | // We need to do this after we've initialized the |
371 | // scripting engines. | 402 | // scripting engines. |
372 | scene.CreateScriptInstances(); | 403 | scene.CreateScriptInstances(); |
@@ -374,6 +405,11 @@ namespace OpenSim | |||
374 | scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); | 405 | scene.loadAllLandObjectsFromStorage(regionInfo.originRegionID); |
375 | scene.EventManager.TriggerParcelPrimCountUpdate(); | 406 | scene.EventManager.TriggerParcelPrimCountUpdate(); |
376 | 407 | ||
408 | if (scene.SnmpService != null) | ||
409 | { | ||
410 | scene.SnmpService.Warning("ScriptEngine started", scene); | ||
411 | } | ||
412 | |||
377 | m_sceneManager.Add(scene); | 413 | m_sceneManager.Add(scene); |
378 | 414 | ||
379 | if (m_autoCreateClientStack) | 415 | if (m_autoCreateClientStack) |
@@ -382,6 +418,10 @@ namespace OpenSim | |||
382 | clientServer.Start(); | 418 | clientServer.Start(); |
383 | } | 419 | } |
384 | 420 | ||
421 | if (scene.SnmpService != null) | ||
422 | { | ||
423 | scene.SnmpService.Warning("Initializing region modules", scene); | ||
424 | } | ||
385 | if (do_post_init) | 425 | if (do_post_init) |
386 | { | 426 | { |
387 | foreach (IRegionModule module in modules) | 427 | foreach (IRegionModule module in modules) |
@@ -393,6 +433,11 @@ namespace OpenSim | |||
393 | 433 | ||
394 | mscene = scene; | 434 | mscene = scene; |
395 | 435 | ||
436 | if (scene.SnmpService != null) | ||
437 | { | ||
438 | scene.SnmpService.Warning("The region is operational", scene); | ||
439 | } | ||
440 | |||
396 | scene.StartTimer(); | 441 | scene.StartTimer(); |
397 | 442 | ||
398 | return clientServer; | 443 | return clientServer; |
diff --git a/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs index 6fd6ba7..8a83fe9 100644 --- a/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ISnmpModule.cs | |||
@@ -4,9 +4,15 @@ | |||
4 | // | 4 | // |
5 | // This file is not open source. All rights reserved | 5 | // This file is not open source. All rights reserved |
6 | // Mod 2 | 6 | // Mod 2 |
7 | |||
8 | using OpenSim.Region.Framework.Scenes; | ||
9 | |||
7 | public interface ISnmpModule | 10 | public interface ISnmpModule |
8 | { | 11 | { |
9 | void Alert(string message); | 12 | void Trap(int code, string Message, Scene scene); |
10 | void Trap(int code,string simname,string Message); | 13 | void Critical(string Message, Scene scene); |
11 | void ColdStart(int step , string simname); | 14 | void Warning(string Message, Scene scene); |
15 | void Major(string Message, Scene scene); | ||
16 | void ColdStart(int step , Scene scene); | ||
17 | void Shutdown(int step , Scene scene); | ||
12 | } | 18 | } |