OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Some more refactoring of GridServer.

GenericGridServerConcept
MW 2009-02-21 15:15:54 +00:00
parent a2546d58a8
commit 913887a8e5
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Grid/GridServer/GridDBService.cs
View File

@ -197,14 +197,13 @@ namespace OpenSim.Grid.GridServer
return regions; return regions;
} }
public void LoginRegion(RegionProfileData sim, RegionProfileData existingSim) public DataResponse LoginRegion(RegionProfileData sim, RegionProfileData existingSim)
{ {
DataResponse insertResponse = DataResponse.RESPONSE_ERROR;
foreach (IGridDataPlugin plugin in _plugins) foreach (IGridDataPlugin plugin in _plugins)
{ {
try try
{ {
DataResponse insertResponse;
if (existingSim == null) if (existingSim == null)
{ {
insertResponse = plugin.AddProfile(sim); insertResponse = plugin.AddProfile(sim);
@ -213,25 +212,6 @@ namespace OpenSim.Grid.GridServer
{ {
insertResponse = plugin.UpdateProfile(sim); insertResponse = plugin.UpdateProfile(sim);
} }
switch (insertResponse)
{
case DataResponse.RESPONSE_OK:
m_log.Info("[LOGIN END]: " + (existingSim == null ? "New" : "Existing") + " sim login successful: " + sim.regionName);
break;
case DataResponse.RESPONSE_ERROR:
m_log.Warn("[LOGIN END]: Sim login failed (Error): " + sim.regionName);
break;
case DataResponse.RESPONSE_INVALIDCREDENTIALS:
m_log.Warn("[LOGIN END]: " +
"Sim login failed (Invalid Credentials): " + sim.regionName);
break;
case DataResponse.RESPONSE_AUTHREQUIRED:
m_log.Warn("[LOGIN END]: " +
"Sim login failed (Authentication Required): " +
sim.regionName);
break;
}
} }
catch (Exception e) catch (Exception e)
{ {
@ -240,6 +220,7 @@ namespace OpenSim.Grid.GridServer
m_log.Warn("[LOGIN END]: " + e.ToString()); m_log.Warn("[LOGIN END]: " + e.ToString());
} }
} }
return insertResponse;
} }
public DataResponse DeleteRegion(string uuid) public DataResponse DeleteRegion(string uuid)

21
OpenSim/Grid/GridServer/GridXmlRpcModule.cs
View File

@ -305,7 +305,26 @@ namespace OpenSim.Grid.GridServer
return e.XmlRpcErrorResponse; return e.XmlRpcErrorResponse;
} }
m_gridDBService.LoginRegion(sim, existingSim); DataResponse insertResponse = m_gridDBService.LoginRegion(sim, existingSim);
switch (insertResponse)
{
case DataResponse.RESPONSE_OK:
m_log.Info("[LOGIN END]: " + (existingSim == null ? "New" : "Existing") + " sim login successful: " + sim.regionName);
break;
case DataResponse.RESPONSE_ERROR:
m_log.Warn("[LOGIN END]: Sim login failed (Error): " + sim.regionName);
break;
case DataResponse.RESPONSE_INVALIDCREDENTIALS:
m_log.Warn("[LOGIN END]: " +
"Sim login failed (Invalid Credentials): " + sim.regionName);
break;
case DataResponse.RESPONSE_AUTHREQUIRED:
m_log.Warn("[LOGIN END]: " +
"Sim login failed (Authentication Required): " +
sim.regionName);
break;
}
XmlRpcResponse response = CreateLoginResponse(sim); XmlRpcResponse response = CreateLoginResponse(sim);