diff options
author | Justin Clarke Casey | 2008-05-12 17:06:37 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-12 17:06:37 +0000 |
commit | bcf018a98c3e95825e21dc3d6b7fc6b0aa315e8f (patch) | |
tree | 6d23f0a82f90d11cb4bfb25d14eea694fe2ed4aa /OpenSim/Grid/GridServer/GridServerBase.cs | |
parent | Move animation handling from ScenePresence into its own class. (diff) | |
download | opensim-SC_OLD-bcf018a98c3e95825e21dc3d6b7fc6b0aa315e8f.zip opensim-SC_OLD-bcf018a98c3e95825e21dc3d6b7fc6b0aa315e8f.tar.gz opensim-SC_OLD-bcf018a98c3e95825e21dc3d6b7fc6b0aa315e8f.tar.bz2 opensim-SC_OLD-bcf018a98c3e95825e21dc3d6b7fc6b0aa315e8f.tar.xz |
* Minor: Make some direct grid server console output into logged messages instead
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/GridServer/GridServerBase.cs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs index 5517953..8adab1a 100644 --- a/OpenSim/Grid/GridServer/GridServerBase.cs +++ b/OpenSim/Grid/GridServer/GridServerBase.cs | |||
@@ -28,7 +28,9 @@ | |||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Reflection; | ||
31 | using System.Timers; | 32 | using System.Timers; |
33 | using log4net; | ||
32 | using Mono.Addins; | 34 | using Mono.Addins; |
33 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Console; | 36 | using OpenSim.Framework.Console; |
@@ -40,6 +42,8 @@ namespace OpenSim.Grid.GridServer | |||
40 | /// </summary> | 42 | /// </summary> |
41 | public class GridServerBase : BaseOpenSimServer, conscmd_callback | 43 | public class GridServerBase : BaseOpenSimServer, conscmd_callback |
42 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
46 | |||
43 | protected GridConfig m_config; | 47 | protected GridConfig m_config; |
44 | protected GridManager m_gridManager; | 48 | protected GridManager m_gridManager; |
45 | protected List<IGridPlugin> m_plugins = new List<IGridPlugin>(); | 49 | protected List<IGridPlugin> m_plugins = new List<IGridPlugin>(); |
@@ -56,7 +60,7 @@ namespace OpenSim.Grid.GridServer | |||
56 | 60 | ||
57 | public GridServerBase() | 61 | public GridServerBase() |
58 | { | 62 | { |
59 | m_console = new ConsoleBase("OpenGrid", this); | 63 | m_console = new ConsoleBase("GRID", this); |
60 | MainConsole.Instance = m_console; | 64 | MainConsole.Instance = m_console; |
61 | } | 65 | } |
62 | 66 | ||
@@ -72,13 +76,13 @@ namespace OpenSim.Grid.GridServer | |||
72 | 76 | ||
73 | public void Startup() | 77 | public void Startup() |
74 | { | 78 | { |
75 | m_console.Status("Starting...\n"); | 79 | m_log.Info("[GRID]: Starting..."); |
76 | 80 | ||
77 | Config(); | 81 | Config(); |
78 | 82 | ||
79 | SetupGridManager(); | 83 | SetupGridManager(); |
80 | 84 | ||
81 | m_console.Status("[GRID]: Starting HTTP process"); | 85 | m_log.Info("[GRID]: Starting HTTP process"); |
82 | m_httpServer = new BaseHttpServer(m_config.HttpPort); | 86 | m_httpServer = new BaseHttpServer(m_config.HttpPort); |
83 | 87 | ||
84 | AddHttpHandlers(); | 88 | AddHttpHandlers(); |
@@ -87,7 +91,7 @@ namespace OpenSim.Grid.GridServer | |||
87 | 91 | ||
88 | m_httpServer.Start(); | 92 | m_httpServer.Start(); |
89 | 93 | ||
90 | m_console.Status("[GRID]: Starting sim status checker"); | 94 | m_log.Info("[GRID]: Starting sim status checker"); |
91 | 95 | ||
92 | Timer simCheckTimer = new Timer(3600000 * 3); // 3 Hours between updates. | 96 | Timer simCheckTimer = new Timer(3600000 * 3); // 3 Hours between updates. |
93 | simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims); | 97 | simCheckTimer.Elapsed += new ElapsedEventHandler(CheckSims); |
@@ -114,14 +118,13 @@ namespace OpenSim.Grid.GridServer | |||
114 | 118 | ||
115 | protected void LoadGridPlugins() | 119 | protected void LoadGridPlugins() |
116 | { | 120 | { |
117 | //m_console.Status("[GRIDPLUGINS]: Looking for plugins"); | ||
118 | AddinManager.Initialize("."); | 121 | AddinManager.Initialize("."); |
119 | AddinManager.Registry.Update(null); | 122 | AddinManager.Registry.Update(null); |
120 | 123 | ||
121 | ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/GridServer"); | 124 | ExtensionNodeList nodes = AddinManager.GetExtensionNodes("/OpenSim/GridServer"); |
122 | foreach (TypeExtensionNode node in nodes) | 125 | foreach (TypeExtensionNode node in nodes) |
123 | { | 126 | { |
124 | m_console.Status("[GRIDPLUGINS]: Loading OpenSim plugin " + node.Path); | 127 | m_log.Info("[GRID PLUGINS]: Loading OpenSim plugin " + node.Path); |
125 | IGridPlugin plugin = (IGridPlugin)node.CreateInstance(); | 128 | IGridPlugin plugin = (IGridPlugin)node.CreateInstance(); |
126 | plugin.Initialise(this); | 129 | plugin.Initialise(this); |
127 | m_plugins.Add(plugin); | 130 | m_plugins.Add(plugin); |
@@ -130,7 +133,7 @@ namespace OpenSim.Grid.GridServer | |||
130 | 133 | ||
131 | protected virtual void SetupGridManager() | 134 | protected virtual void SetupGridManager() |
132 | { | 135 | { |
133 | m_console.Status("[GRID]: Connecting to Storage Server"); | 136 | m_log.Info("[DATA]: Connecting to Storage Server"); |
134 | m_gridManager = new GridManager(); | 137 | m_gridManager = new GridManager(); |
135 | m_gridManager.AddPlugin(m_config.DatabaseProvider); | 138 | m_gridManager.AddPlugin(m_config.DatabaseProvider); |
136 | m_gridManager.Config = m_config; | 139 | m_gridManager.Config = m_config; |