aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/ApplicationPlugins
diff options
context:
space:
mode:
authorJeff Ames2008-02-05 19:44:27 +0000
committerJeff Ames2008-02-05 19:44:27 +0000
commit6ed5283bc06a62f38eb517e67b975832b603bf61 (patch)
treee5f635018789b73a99ddeca0883a68368fa5eece /OpenSim/ApplicationPlugins
parentCut down on the number of packets sent during terraforming. Terraforming shou... (diff)
downloadopensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.zip
opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.gz
opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.bz2
opensim-SC_OLD-6ed5283bc06a62f38eb517e67b975832b603bf61.tar.xz
Converted logging to use log4net.
Changed LogBase to ConsoleBase, which handles console I/O. This is mostly an in-place conversion, so lots of refactoring can still be done.
Diffstat (limited to '')
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs18
-rw-r--r--OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs2
-rw-r--r--OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs18
3 files changed, 21 insertions, 17 deletions
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
index 4c1c1d2..3cd918c 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/LoadRegionsPlugin.cs
@@ -40,19 +40,21 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
40 [Extension("/OpenSim/Startup")] 40 [Extension("/OpenSim/Startup")]
41 public class LoadRegionsPlugin : IApplicationPlugin 41 public class LoadRegionsPlugin : IApplicationPlugin
42 { 42 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
44
43 public void Initialise(OpenSimMain openSim) 45 public void Initialise(OpenSimMain openSim)
44 { 46 {
45 MainLog.Instance.Notice("LOADREGIONS", "Load Regions addin being initialised"); 47 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
46 48
47 IRegionLoader regionLoader; 49 IRegionLoader regionLoader;
48 if (openSim.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem") 50 if (openSim.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
49 { 51 {
50 MainLog.Instance.Notice("LOADREGIONS", "Loading Region Info from filesystem"); 52 m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem");
51 regionLoader = new RegionLoaderFileSystem(); 53 regionLoader = new RegionLoaderFileSystem();
52 } 54 }
53 else 55 else
54 { 56 {
55 MainLog.Instance.Notice("LOADREGIONSPLUGIN", "Loading Region Info from web"); 57 m_log.Info("[LOADREGIONSPLUGIN]: Loading Region Info from web");
56 regionLoader = new RegionLoaderWebServer(); 58 regionLoader = new RegionLoaderWebServer();
57 } 59 }
58 60
@@ -63,7 +65,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
63 65
64 for (int i = 0; i < regionsToLoad.Length; i++) 66 for (int i = 0; i < regionsToLoad.Length; i++)
65 { 67 {
66 MainLog.Instance.Debug("LOADREGIONS", "Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")"); 68 m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")");
67 openSim.CreateRegion(regionsToLoad[i]); 69 openSim.CreateRegion(regionsToLoad[i]);
68 } 70 }
69 71
@@ -73,17 +75,17 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
73 75
74 public void LoadRegionFromConfig(OpenSimMain openSim, ulong regionhandle) 76 public void LoadRegionFromConfig(OpenSimMain openSim, ulong regionhandle)
75 { 77 {
76 MainLog.Instance.Notice("LOADREGIONS", "Load Regions addin being initialised"); 78 m_log.Info("[LOADREGIONS]: Load Regions addin being initialised");
77 79
78 IRegionLoader regionLoader; 80 IRegionLoader regionLoader;
79 if (openSim.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem") 81 if (openSim.ConfigSource.Configs["Startup"].GetString("region_info_source", "filesystem") == "filesystem")
80 { 82 {
81 MainLog.Instance.Notice("LOADREGIONS", "Loading Region Info from filesystem"); 83 m_log.Info("[LOADREGIONS]: Loading Region Info from filesystem");
82 regionLoader = new RegionLoaderFileSystem(); 84 regionLoader = new RegionLoaderFileSystem();
83 } 85 }
84 else 86 else
85 { 87 {
86 MainLog.Instance.Notice("LOADREGIONS", "Loading Region Info from web"); 88 m_log.Info("[LOADREGIONS]: Loading Region Info from web");
87 regionLoader = new RegionLoaderWebServer(); 89 regionLoader = new RegionLoaderWebServer();
88 } 90 }
89 91
@@ -93,7 +95,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
93 { 95 {
94 if (regionhandle == regionsToLoad[i].RegionHandle) 96 if (regionhandle == regionsToLoad[i].RegionHandle)
95 { 97 {
96 MainLog.Instance.Debug("LOADREGIONS", "Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")"); 98 m_log.Debug("[LOADREGIONS]: Creating Region: " + regionsToLoad[i].RegionName + " (ThreadID: " + System.Threading.Thread.CurrentThread.ManagedThreadId.ToString() + ")");
97 openSim.CreateRegion(regionsToLoad[i]); 99 openSim.CreateRegion(regionsToLoad[i]);
98 } 100 }
99 } 101 }
diff --git a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
index 638ed33..9476f17 100644
--- a/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
+++ b/OpenSim/ApplicationPlugins/LoadRegions/Properties/AssemblyInfo.cs
@@ -64,4 +64,4 @@ using System.Runtime.InteropServices;
64// [assembly: AssemblyVersion("1.0.*")] 64// [assembly: AssemblyVersion("1.0.*")]
65 65
66[assembly : AssemblyVersion("1.0.0.0")] 66[assembly : AssemblyVersion("1.0.0.0")]
67[assembly : AssemblyFileVersion("1.0.0.0")] \ No newline at end of file 67[assembly : AssemblyFileVersion("1.0.0.0")]
diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index 770abe7..d80e478 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -46,6 +46,8 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
46 [Extension("/OpenSim/Startup")] 46 [Extension("/OpenSim/Startup")]
47 public class RemoteAdminPlugin : IApplicationPlugin 47 public class RemoteAdminPlugin : IApplicationPlugin
48 { 48 {
49 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
50
49 private OpenSimMain m_app; 51 private OpenSimMain m_app;
50 private BaseHttpServer m_httpd; 52 private BaseHttpServer m_httpd;
51 private string requiredPassword = String.Empty; 53 private string requiredPassword = String.Empty;
@@ -56,7 +58,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
56 { 58 {
57 if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false)) 59 if (openSim.ConfigSource.Configs["RemoteAdmin"].GetBoolean("enabled", false))
58 { 60 {
59 MainLog.Instance.Verbose("RADMIN", "Remote Admin Plugin Enabled"); 61 m_log.Info("[RADMIN]: Remote Admin Plugin Enabled");
60 requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", String.Empty); 62 requiredPassword = openSim.ConfigSource.Configs["RemoteAdmin"].GetString("access_password", String.Empty);
61 63
62 m_app = openSim; 64 m_app = openSim;
@@ -126,7 +128,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
126 else 128 else
127 { 129 {
128 string message = (string) requestData["message"]; 130 string message = (string) requestData["message"];
129 MainLog.Instance.Verbose("RADMIN", "Broadcasting: " + message); 131 m_log.Info("[RADMIN]: Broadcasting: " + message);
130 132
131 responseData["accepted"] = "true"; 133 responseData["accepted"] = "true";
132 response.Value = responseData; 134 response.Value = responseData;
@@ -153,7 +155,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
153 { 155 {
154 string file = (string)requestData["filename"]; 156 string file = (string)requestData["filename"];
155 LLUUID regionID = LLUUID.Parse((string)requestData["regionid"]); 157 LLUUID regionID = LLUUID.Parse((string)requestData["regionid"]);
156 MainLog.Instance.Verbose("RADMIN", "Terrain Loading: " + file); 158 m_log.Info("[RADMIN]: Terrain Loading: " + file);
157 159
158 responseData["accepted"] = "true"; 160 responseData["accepted"] = "true";
159 161
@@ -177,7 +179,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
177 179
178 public XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request) 180 public XmlRpcResponse XmlRpcShutdownMethod(XmlRpcRequest request)
179 { 181 {
180 MainLog.Instance.Verbose("RADMIN", "Received Shutdown Administrator Request"); 182 m_log.Info("[RADMIN]: Received Shutdown Administrator Request");
181 XmlRpcResponse response = new XmlRpcResponse(); 183 XmlRpcResponse response = new XmlRpcResponse();
182 Hashtable requestData = (Hashtable) request.Params[0]; 184 Hashtable requestData = (Hashtable) request.Params[0];
183 Hashtable responseData = new Hashtable(); 185 Hashtable responseData = new Hashtable();
@@ -233,7 +235,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
233 235
234 public XmlRpcResponse XmlRpcCreateRegionMethod(XmlRpcRequest request) 236 public XmlRpcResponse XmlRpcCreateRegionMethod(XmlRpcRequest request)
235 { 237 {
236 MainLog.Instance.Verbose("RADMIN", "Received Create Region Administrator Request"); 238 m_log.Info("[RADMIN]: Received Create Region Administrator Request");
237 XmlRpcResponse response = new XmlRpcResponse(); 239 XmlRpcResponse response = new XmlRpcResponse();
238 Hashtable requestData = (Hashtable) request.Params[0]; 240 Hashtable requestData = (Hashtable) request.Params[0];
239 Hashtable responseData = new Hashtable(); 241 Hashtable responseData = new Hashtable();
@@ -284,7 +286,7 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
284 286
285 public XmlRpcResponse XmlRpcCreateUserMethod(XmlRpcRequest request) 287 public XmlRpcResponse XmlRpcCreateUserMethod(XmlRpcRequest request)
286 { 288 {
287 MainLog.Instance.Verbose("RADMIN", "Received Create User Administrator Request"); 289 m_log.Info("[RADMIN]: Received Create User Administrator Request");
288 XmlRpcResponse response = new XmlRpcResponse(); 290 XmlRpcResponse response = new XmlRpcResponse();
289 Hashtable requestData = (Hashtable) request.Params[0]; 291 Hashtable requestData = (Hashtable) request.Params[0];
290 Hashtable responseData = new Hashtable(); 292 Hashtable responseData = new Hashtable();
@@ -312,14 +314,14 @@ namespace OpenSim.ApplicationPlugins.LoadRegions
312 responseData["error"] = "Error creating user"; 314 responseData["error"] = "Error creating user";
313 responseData["avatar_uuid"] = LLUUID.Zero; 315 responseData["avatar_uuid"] = LLUUID.Zero;
314 response.Value = responseData; 316 response.Value = responseData;
315 MainLog.Instance.Error("RADMIN", "Error creating user (" + tempfirstname + " " + templastname + ") :"); 317 m_log.Error("[RADMIN]: Error creating user (" + tempfirstname + " " + templastname + ") :");
316 } 318 }
317 else 319 else
318 { 320 {
319 responseData["created"] = "true"; 321 responseData["created"] = "true";
320 responseData["avatar_uuid"] = tempuserID; 322 responseData["avatar_uuid"] = tempuserID;
321 response.Value = responseData; 323 response.Value = responseData;
322 MainLog.Instance.Verbose("RADMIN", "User " + tempfirstname + " " + templastname + " created. Userid " + tempuserID + " assigned."); 324 m_log.Info("[RADMIN]: User " + tempfirstname + " " + templastname + " created. Userid " + tempuserID + " assigned.");
323 } 325 }
324 } 326 }
325 catch (Exception e) 327 catch (Exception e)