From 01db4cd71dd935407c1449e34921719036c2ec56 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Tue, 4 Dec 2007 10:22:09 +0000
Subject: * More console message fixes * Tagged Verbose("msg",...) as obsolete.
Please use Verbose("AREA","msg",...) instead.
---
OpenSim/Framework/Communications/LoginService.cs | 4 ++--
.../Framework/Communications/UserManagerBase.cs | 25 +++++++++++-----------
OpenSim/Framework/Console/LogBase.cs | 1 +
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index e7441b8..d18cf63 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Framework.UserManagement
}
catch (Exception e)
{
- MainLog.Instance.Verbose(e.ToString());
+ MainLog.Instance.Verbose("LOGIN", e.ToString());
return logResponse.CreateDeadRegionResponse();
//return logResponse.ToXmlRpcResponse();
}
@@ -168,7 +168,7 @@ namespace OpenSim.Framework.UserManagement
catch (Exception E)
{
- MainLog.Instance.Verbose(E.ToString());
+ MainLog.Instance.Verbose("LOGIN", E.ToString());
}
//}
}
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 119f8a5..88214cd 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -50,10 +50,10 @@ namespace OpenSim.Framework.UserManagement
{
if (!String.IsNullOrEmpty(FileName))
{
- MainLog.Instance.Verbose("Userstorage: Attempting to load " + FileName);
+ MainLog.Instance.Verbose("USERSTORAGE", "Attempting to load " + FileName);
Assembly pluginAssembly = Assembly.LoadFrom(FileName);
- MainLog.Instance.Verbose("Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
+ MainLog.Instance.Verbose("USERSTORAGE", "Found " + pluginAssembly.GetTypes().Length + " interfaces.");
foreach (Type pluginType in pluginAssembly.GetTypes())
{
if (!pluginType.IsAbstract)
@@ -75,7 +75,7 @@ namespace OpenSim.Framework.UserManagement
{
plug.Initialise();
_plugins.Add(plug.getName(), plug);
- MainLog.Instance.Verbose("Userstorage: Added IUserData Interface");
+ MainLog.Instance.Verbose("USERSTORAGE", "Added IUserData Interface");
}
#region Get UserProfile
@@ -97,7 +97,7 @@ namespace OpenSim.Framework.UserManagement
}
catch (Exception e)
{
- MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+ MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@@ -116,7 +116,7 @@ namespace OpenSim.Framework.UserManagement
}
catch (Exception)
{
- MainLog.Instance.Verbose("Unable to generate AgentPickerData via " + plugin.Key + "(" + query + ")");
+ MainLog.Instance.Verbose("USERSTORAGE", "Unable to generate AgentPickerData via " + plugin.Key + "(" + query + ")");
return new List<AvatarPickerAvatar>();
}
}
@@ -141,8 +141,7 @@ namespace OpenSim.Framework.UserManagement
}
catch (Exception e)
{
- System.Console.WriteLine("EEK!");
- MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+ MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@@ -169,7 +168,7 @@ namespace OpenSim.Framework.UserManagement
}
catch (Exception e)
{
- MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+ MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@@ -193,7 +192,7 @@ namespace OpenSim.Framework.UserManagement
}
catch (Exception e)
{
- MainLog.Instance.Verbose("Unable to set user via " + plugin.Key + "(" + e.ToString() + ")");
+ MainLog.Instance.Verbose("USERSTORAGE", "Unable to set user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@@ -219,7 +218,7 @@ namespace OpenSim.Framework.UserManagement
}
catch (Exception e)
{
- MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+ MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@@ -241,7 +240,7 @@ namespace OpenSim.Framework.UserManagement
}
catch (Exception e)
{
- MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+ MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@@ -274,7 +273,7 @@ namespace OpenSim.Framework.UserManagement
}
catch (Exception e)
{
- MainLog.Instance.Verbose("Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+ MainLog.Instance.Verbose("USERSTORAGE", "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@@ -388,7 +387,7 @@ namespace OpenSim.Framework.UserManagement
}
catch (Exception e)
{
- MainLog.Instance.Verbose("Unable to add user via " + plugin.Key + "(" + e.ToString() + ")");
+ MainLog.Instance.Verbose("USERSTORAGE", "Unable to add user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
diff --git a/OpenSim/Framework/Console/LogBase.cs b/OpenSim/Framework/Console/LogBase.cs
index 6c97768..99c0128 100644
--- a/OpenSim/Framework/Console/LogBase.cs
+++ b/OpenSim/Framework/Console/LogBase.cs
@@ -168,6 +168,7 @@ namespace OpenSim.Framework.Console
/// </summary>
/// <param name="format">The message to send</param>
/// <param name="args">WriteLine-style message arguments</param>
+ [Obsolete("Please tag your console messages with the location your calling from")]
public void Verbose(string format, params object[] args)
{
if (m_verbose)
--
cgit v1.1