From 75f9b25b41b5a80025e17808b5b2d9fe7295d54e Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Tue, 5 Jun 2007 13:18:44 +0000
Subject: * Fixed OGS build * Converted to new console interfaces * Fixed other
minor issues which somehow snuck in
---
.../OpenGridServices.UserServer/UserManager.cs | 23 +++++++++++-----------
1 file changed, 11 insertions(+), 12 deletions(-)
(limited to 'OpenGridServices/OpenGridServices.UserServer/UserManager.cs')
diff --git a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
index 21ecc50..7dd404d 100644
--- a/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/UserManager.cs
@@ -27,10 +27,10 @@ namespace OpenGridServices.UserServer
/// The filename to the user server plugin DLL
public void AddPlugin(string FileName)
{
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Attempting to load " + FileName);
+ OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
Assembly pluginAssembly = Assembly.LoadFrom(FileName);
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
+ OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
foreach (Type pluginType in pluginAssembly.GetTypes())
{
if (!pluginType.IsAbstract)
@@ -42,7 +42,7 @@ namespace OpenGridServices.UserServer
IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
plug.Initialise();
this._plugins.Add(plug.getName(), plug);
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Added IUserData Interface");
+ OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Added IUserData Interface");
}
typeInterface = null;
@@ -78,7 +78,7 @@ namespace OpenGridServices.UserServer
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+ OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
}
@@ -100,7 +100,7 @@ namespace OpenGridServices.UserServer
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+ OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@@ -125,7 +125,7 @@ namespace OpenGridServices.UserServer
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+ OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@@ -157,7 +157,7 @@ namespace OpenGridServices.UserServer
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+ OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@@ -179,7 +179,7 @@ namespace OpenGridServices.UserServer
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+ OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@@ -201,7 +201,7 @@ namespace OpenGridServices.UserServer
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+ OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@@ -224,7 +224,7 @@ namespace OpenGridServices.UserServer
}
catch (Exception e)
{
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
+ OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
}
}
@@ -348,8 +348,7 @@ namespace OpenGridServices.UserServer
/// Authenticated?
public bool AuthenticateUser(ref UserProfileData profile, string password)
{
- OpenSim.Framework.Console.MainConsole.Instance.WriteLine(
- OpenSim.Framework.Console.LogPriority.LOW,
+ OpenSim.Framework.Console.MainConsole.Instance.Verbose(
"Authenticating " + profile.username + " " + profile.surname);
password = password.Remove(0, 3); //remove $1$
--
cgit v1.1