diff options
author | Charles Krinke | 2009-02-22 20:52:55 +0000 |
---|---|---|
committer | Charles Krinke | 2009-02-22 20:52:55 +0000 |
commit | 8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49 (patch) | |
tree | 96a24a49de82056060dd9b7bab0cb209d5f1a129 /OpenSim/Grid | |
parent | Allow delivery of object messages gridwide (diff) | |
download | opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.zip opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.gz opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.bz2 opensim-SC_OLD-8f55b9d735fbc975ce7a4b54e972c17ffbfb1f49.tar.xz |
Mantis#3218. Thank you kindly, TLaukkan (Tommil) for a patch that:
* Added log4net dependency to physxplugin in prebuild.xml.
* Added missing m_log fields to classes.
* Replaced Console.WriteLine with appropriate m_log.Xxxx
* Tested that nant test target runs succesfully.
* Tested that local opensim sandbox starts up without errors.
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r-- | OpenSim/Grid/AssetInventoryServer/Main.cs | 6 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridRestModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/GridServer/GridXmlRpcModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Grid/UserServer/UserManager.cs | 4 |
4 files changed, 9 insertions, 5 deletions
diff --git a/OpenSim/Grid/AssetInventoryServer/Main.cs b/OpenSim/Grid/AssetInventoryServer/Main.cs index 67aaf95..598b754 100644 --- a/OpenSim/Grid/AssetInventoryServer/Main.cs +++ b/OpenSim/Grid/AssetInventoryServer/Main.cs | |||
@@ -28,11 +28,15 @@ | |||
28 | using System; | 28 | using System; |
29 | using Nini.Config; | 29 | using Nini.Config; |
30 | using log4net.Config; | 30 | using log4net.Config; |
31 | using log4net; | ||
32 | using System.Reflection; | ||
31 | 33 | ||
32 | namespace OpenSim.Grid.AssetInventoryServer | 34 | namespace OpenSim.Grid.AssetInventoryServer |
33 | { | 35 | { |
34 | class MainEntry | 36 | class MainEntry |
35 | { | 37 | { |
38 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
39 | |||
36 | static void Main(string[] args) | 40 | static void Main(string[] args) |
37 | { | 41 | { |
38 | XmlConfigurator.Configure(); | 42 | XmlConfigurator.Configure(); |
@@ -46,7 +50,7 @@ namespace OpenSim.Grid.AssetInventoryServer | |||
46 | Console.CancelKeyPress += | 50 | Console.CancelKeyPress += |
47 | delegate(object sender, ConsoleCancelEventArgs e) | 51 | delegate(object sender, ConsoleCancelEventArgs e) |
48 | { | 52 | { |
49 | Console.WriteLine("AssetInventory server is shutting down..."); | 53 | m_log.Info("AssetInventory server is shutting down..."); |
50 | server.Shutdown(); | 54 | server.Shutdown(); |
51 | Environment.Exit(0); | 55 | Environment.Exit(0); |
52 | }; | 56 | }; |
diff --git a/OpenSim/Grid/GridServer/GridRestModule.cs b/OpenSim/Grid/GridServer/GridRestModule.cs index e0c1288..7d3bd18 100644 --- a/OpenSim/Grid/GridServer/GridRestModule.cs +++ b/OpenSim/Grid/GridServer/GridRestModule.cs | |||
@@ -182,7 +182,7 @@ namespace OpenSim.Grid.GridServer | |||
182 | public string RestSetSimMethod(string request, string path, string param, | 182 | public string RestSetSimMethod(string request, string path, string param, |
183 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) | 183 | OSHttpRequest httpRequest, OSHttpResponse httpResponse) |
184 | { | 184 | { |
185 | Console.WriteLine("Processing region update via REST method"); | 185 | m_log.Info("Processing region update via REST method"); |
186 | RegionProfileData theSim; | 186 | RegionProfileData theSim; |
187 | theSim = m_gridDBService.GetRegion(new UUID(param)); | 187 | theSim = m_gridDBService.GetRegion(new UUID(param)); |
188 | if (theSim == null) | 188 | if (theSim == null) |
diff --git a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs index f320ccc..8998b55 100644 --- a/OpenSim/Grid/GridServer/GridXmlRpcModule.cs +++ b/OpenSim/Grid/GridServer/GridXmlRpcModule.cs | |||
@@ -627,7 +627,7 @@ namespace OpenSim.Grid.GridServer | |||
627 | else if (requestData.ContainsKey("region_handle")) | 627 | else if (requestData.ContainsKey("region_handle")) |
628 | { | 628 | { |
629 | //CFK: The if/else below this makes this message redundant. | 629 | //CFK: The if/else below this makes this message redundant. |
630 | //CFK: Console.WriteLine("requesting data for region " + (string) requestData["region_handle"]); | 630 | //CFK: m_log.Info("requesting data for region " + (string) requestData["region_handle"]); |
631 | ulong regionHandle = Convert.ToUInt64((string)requestData["region_handle"]); | 631 | ulong regionHandle = Convert.ToUInt64((string)requestData["region_handle"]); |
632 | simData = m_gridDBService.GetRegion(regionHandle); | 632 | simData = m_gridDBService.GetRegion(regionHandle); |
633 | if (simData == null) | 633 | if (simData == null) |
diff --git a/OpenSim/Grid/UserServer/UserManager.cs b/OpenSim/Grid/UserServer/UserManager.cs index f3e9884..6229dec 100644 --- a/OpenSim/Grid/UserServer/UserManager.cs +++ b/OpenSim/Grid/UserServer/UserManager.cs | |||
@@ -402,7 +402,7 @@ namespace OpenSim.Grid.UserServer | |||
402 | Hashtable requestData = (Hashtable) request.Params[0]; | 402 | Hashtable requestData = (Hashtable) request.Params[0]; |
403 | UserProfileData userProfile; | 403 | UserProfileData userProfile; |
404 | //CFK: this clogs the UserServer log and is not necessary at this time. | 404 | //CFK: this clogs the UserServer log and is not necessary at this time. |
405 | //CFK: Console.WriteLine("METHOD BY UUID CALLED"); | 405 | //CFK: m_log.Debug("METHOD BY UUID CALLED"); |
406 | if (requestData.Contains("avatar_uuid")) | 406 | if (requestData.Contains("avatar_uuid")) |
407 | { | 407 | { |
408 | try | 408 | try |
@@ -435,7 +435,7 @@ namespace OpenSim.Grid.UserServer | |||
435 | Hashtable requestData = (Hashtable) request.Params[0]; | 435 | Hashtable requestData = (Hashtable) request.Params[0]; |
436 | UserProfileData userProfile; | 436 | UserProfileData userProfile; |
437 | //CFK: this clogs the UserServer log and is not necessary at this time. | 437 | //CFK: this clogs the UserServer log and is not necessary at this time. |
438 | //CFK: Console.WriteLine("METHOD BY UUID CALLED"); | 438 | //CFK: m_log.Debug("METHOD BY UUID CALLED"); |
439 | if (requestData.Contains("avatar_uuid")) | 439 | if (requestData.Contains("avatar_uuid")) |
440 | { | 440 | { |
441 | UUID guess; | 441 | UUID guess; |