aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenGridServices/OpenGridServices.UserServer
diff options
context:
space:
mode:
Diffstat (limited to 'OpenGridServices/OpenGridServices.UserServer')
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/Main.cs12
-rw-r--r--OpenGridServices/OpenGridServices.UserServer/UserManager.cs23
2 files changed, 17 insertions, 18 deletions
diff --git a/OpenGridServices/OpenGridServices.UserServer/Main.cs b/OpenGridServices/OpenGridServices.UserServer/Main.cs
index 3b17cff..d4fe355 100644
--- a/OpenGridServices/OpenGridServices.UserServer/Main.cs
+++ b/OpenGridServices/OpenGridServices.UserServer/Main.cs
@@ -81,7 +81,7 @@ namespace OpenGridServices.UserServer
81 81
82 private void Work() 82 private void Work()
83 { 83 {
84 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"\nEnter help for a list of commands\n"); 84 m_console.Notice("Enter help for a list of commands\n");
85 85
86 while (true) 86 while (true)
87 { 87 {
@@ -96,16 +96,16 @@ namespace OpenGridServices.UserServer
96 this.ConfigDB(this.localXMLConfig); 96 this.ConfigDB(this.localXMLConfig);
97 this.localXMLConfig.Close(); 97 this.localXMLConfig.Close();
98 98
99 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Loading configuration"); 99 MainConsole.Instance.Verbose("Main.cs:Startup() - Loading configuration");
100 Cfg = this.LoadConfigDll(this.ConfigDll); 100 Cfg = this.LoadConfigDll(this.ConfigDll);
101 Cfg.InitConfig(); 101 Cfg.InitConfig();
102 102
103 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Establishing data connection"); 103 MainConsole.Instance.Verbose( "Main.cs:Startup() - Establishing data connection");
104 m_userManager = new UserManager(); 104 m_userManager = new UserManager();
105 m_userManager._config = Cfg; 105 m_userManager._config = Cfg;
106 m_userManager.AddPlugin(StorageDll); 106 m_userManager.AddPlugin(StorageDll);
107 107
108 MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process"); 108 MainConsole.Instance.Verbose("Main.cs:Startup() - Starting HTTP process");
109 BaseHttpServer httpServer = new BaseHttpServer(8002); 109 BaseHttpServer httpServer = new BaseHttpServer(8002);
110 110
111 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod); 111 httpServer.AddXmlRPCHandler("login_to_simulator", m_userManager.XmlRpcLoginMethod);
@@ -144,8 +144,8 @@ namespace OpenGridServices.UserServer
144 switch (cmd) 144 switch (cmd)
145 { 145 {
146 case "help": 146 case "help":
147 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"create user - create a new user"); 147 m_console.Notice("create user - create a new user");
148 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH,"shutdown - shutdown the grid (USE CAUTION!)"); 148 m_console.Notice("shutdown - shutdown the grid (USE CAUTION!)");
149 break; 149 break;
150 150
151 case "create": 151 case "create":
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
27 /// <param name="FileName">The filename to the user server plugin DLL</param> 27 /// <param name="FileName">The filename to the user server plugin DLL</param>
28 public void AddPlugin(string FileName) 28 public void AddPlugin(string FileName)
29 { 29 {
30 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Attempting to load " + FileName); 30 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Attempting to load " + FileName);
31 Assembly pluginAssembly = Assembly.LoadFrom(FileName); 31 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
32 32
33 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces."); 33 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Found " + pluginAssembly.GetTypes().Length + " interfaces.");
34 foreach (Type pluginType in pluginAssembly.GetTypes()) 34 foreach (Type pluginType in pluginAssembly.GetTypes())
35 { 35 {
36 if (!pluginType.IsAbstract) 36 if (!pluginType.IsAbstract)
@@ -42,7 +42,7 @@ namespace OpenGridServices.UserServer
42 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 42 IUserData plug = (IUserData)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
43 plug.Initialise(); 43 plug.Initialise();
44 this._plugins.Add(plug.getName(), plug); 44 this._plugins.Add(plug.getName(), plug);
45 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Userstorage: Added IUserData Interface"); 45 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Userstorage: Added IUserData Interface");
46 } 46 }
47 47
48 typeInterface = null; 48 typeInterface = null;
@@ -78,7 +78,7 @@ namespace OpenGridServices.UserServer
78 } 78 }
79 catch (Exception e) 79 catch (Exception e)
80 { 80 {
81 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 81 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
82 } 82 }
83 } 83 }
84 } 84 }
@@ -100,7 +100,7 @@ namespace OpenGridServices.UserServer
100 } 100 }
101 catch (Exception e) 101 catch (Exception e)
102 { 102 {
103 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 103 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
104 } 104 }
105 } 105 }
106 106
@@ -125,7 +125,7 @@ namespace OpenGridServices.UserServer
125 } 125 }
126 catch (Exception e) 126 catch (Exception e)
127 { 127 {
128 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 128 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
129 } 129 }
130 } 130 }
131 131
@@ -157,7 +157,7 @@ namespace OpenGridServices.UserServer
157 } 157 }
158 catch (Exception e) 158 catch (Exception e)
159 { 159 {
160 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 160 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
161 } 161 }
162 } 162 }
163 163
@@ -179,7 +179,7 @@ namespace OpenGridServices.UserServer
179 } 179 }
180 catch (Exception e) 180 catch (Exception e)
181 { 181 {
182 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 182 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
183 } 183 }
184 } 184 }
185 185
@@ -201,7 +201,7 @@ namespace OpenGridServices.UserServer
201 } 201 }
202 catch (Exception e) 202 catch (Exception e)
203 { 203 {
204 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 204 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
205 } 205 }
206 } 206 }
207 207
@@ -224,7 +224,7 @@ namespace OpenGridServices.UserServer
224 } 224 }
225 catch (Exception e) 225 catch (Exception e)
226 { 226 {
227 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")"); 227 OpenSim.Framework.Console.MainConsole.Instance.Verbose( "Unable to find user via " + plugin.Key + "(" + e.ToString() + ")");
228 } 228 }
229 } 229 }
230 230
@@ -348,8 +348,7 @@ namespace OpenGridServices.UserServer
348 /// <returns>Authenticated?</returns> 348 /// <returns>Authenticated?</returns>
349 public bool AuthenticateUser(ref UserProfileData profile, string password) 349 public bool AuthenticateUser(ref UserProfileData profile, string password)
350 { 350 {
351 OpenSim.Framework.Console.MainConsole.Instance.WriteLine( 351 OpenSim.Framework.Console.MainConsole.Instance.Verbose(
352 OpenSim.Framework.Console.LogPriority.LOW,
353 "Authenticating " + profile.username + " " + profile.surname); 352 "Authenticating " + profile.username + " " + profile.surname);
354 353
355 password = password.Remove(0, 3); //remove $1$ 354 password = password.Remove(0, 3); //remove $1$