Compare commits

...

3 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
40144fb0f6 Change 0.7.6.1 flavour to release 2014-01-31 20:28:09 +00:00
Justin Clark-Casey (justincc)
75777ddd57 Record whether login to home fails because no home set (UUID.Zero) or region not found. 2014-01-30 00:50:53 +00:00
Justin Clark-Casey (justincc)
6dd99837fd Add "show grid user" robust/standalone console command for debug purposes.
Shows all data on entries which match or start with a given ID.
This would usually be a UUID.
2014-01-30 00:28:49 +00:00
3 changed files with 56 additions and 8 deletions

View File

@@ -30,7 +30,7 @@ namespace OpenSim
public class VersionInfo
{
private const string VERSION_NUMBER = "0.7.6.1";
private const Flavour VERSION_FLAVOUR = Flavour.RC1;
private const Flavour VERSION_FLAVOUR = Flavour.Release;
public enum Flavour
{

View File

@@ -382,11 +382,30 @@ namespace OpenSim.Services.LLLoginService
//
GridRegion home = null;
GridUserInfo guinfo = m_GridUserService.LoggedIn(account.PrincipalID.ToString());
if (guinfo != null && (guinfo.HomeRegionID != UUID.Zero) && m_GridService != null)
// We are only going to complain about no home if the user actually tries to login there, to avoid
// spamming the console.
if (guinfo != null)
{
home = m_GridService.GetRegionByUUID(scopeID, guinfo.HomeRegionID);
if (guinfo.HomeRegionID == UUID.Zero && startLocation == "home")
{
m_log.WarnFormat(
"[LLOGIN SERVICE]: User {0} tried to login to a 'home' start location but they have none set",
account.Name);
}
else if (m_GridService != null)
{
home = m_GridService.GetRegionByUUID(scopeID, guinfo.HomeRegionID);
if (home == null && startLocation == "home")
{
m_log.WarnFormat(
"[LLOGIN SERVICE]: User {0} tried to login to a 'home' start location with ID {1} but this was not found.",
account.Name, guinfo.HomeRegionID);
}
}
}
if (guinfo == null)
else
{
// something went wrong, make something up, so that we don't have to test this anywhere else
guinfo = new GridUserInfo();
@@ -506,10 +525,6 @@ namespace OpenSim.Services.LLLoginService
if (home == null)
{
m_log.WarnFormat(
"[LLOGIN SERVICE]: User {0} {1} tried to login to a 'home' start location but they have none set",
account.FirstName, account.LastName);
tryDefaults = true;
}
else

View File

@@ -48,6 +48,14 @@ namespace OpenSim.Services.UserAccountService
{
m_log.Debug("[GRID USER SERVICE]: Starting user grid service");
MainConsole.Instance.Commands.AddCommand(
"Users", false,
"show grid user",
"show grid user <ID>",
"Show grid user entry or entries that match or start with the given ID. This will normally be a UUID.",
"This is for debug purposes to see what data is found for a particular user id.",
HandleShowGridUser);
MainConsole.Instance.Commands.AddCommand(
"Users", false,
"show grid users online",
@@ -58,6 +66,31 @@ namespace OpenSim.Services.UserAccountService
HandleShowGridUsersOnline);
}
protected void HandleShowGridUser(string module, string[] cmdparams)
{
if (cmdparams.Length != 4)
{
MainConsole.Instance.Output("Usage: show grid user <UUID>");
return;
}
GridUserData[] data = m_Database.GetAll(cmdparams[3]);
foreach (GridUserData gu in data)
{
ConsoleDisplayList cdl = new ConsoleDisplayList();
cdl.AddRow("User ID", gu.UserID);
foreach (KeyValuePair<string,string> kvp in gu.Data)
cdl.AddRow(kvp.Key, kvp.Value);
MainConsole.Instance.Output(cdl.ToString());
}
MainConsole.Instance.OutputFormat("Entries: {0}", data.Length);
}
protected void HandleShowGridUsersOnline(string module, string[] cmdparams)
{
// if (cmdparams.Length != 4)