Fixing the previous patch to work correctly with standalone mode
parent
0b5141d45b
commit
9e3cdc4da5
|
@ -88,15 +88,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
|||
IConfig gridConfig = source.Configs["AssetService"];
|
||||
if (gridConfig == null)
|
||||
{
|
||||
m_log.Info("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini, skipping SimianAssetServiceConnector");
|
||||
return;
|
||||
m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini");
|
||||
throw new Exception("Asset connector init error");
|
||||
}
|
||||
|
||||
string serviceUrl = gridConfig.GetString("AssetServerURI");
|
||||
if (String.IsNullOrEmpty(serviceUrl))
|
||||
{
|
||||
m_log.Error("[ASSET CONNECTOR]: No AssetServerURI in section AssetService");
|
||||
throw new Exception("Asset connector init error");
|
||||
m_log.Info("[ASSET CONNECTOR]: No AssetServerURI in section AssetService, skipping SimianAssetServiceConnector");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!serviceUrl.EndsWith("/"))
|
||||
|
|
|
@ -76,15 +76,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
|||
IConfig assetConfig = source.Configs["AuthenticationService"];
|
||||
if (assetConfig == null)
|
||||
{
|
||||
m_log.Info("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini, skipping SimianAuthenticationServiceConnector");
|
||||
return;
|
||||
m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini");
|
||||
throw new Exception("Authentication connector init error");
|
||||
}
|
||||
|
||||
string serviceURI = assetConfig.GetString("AuthenticationServerURI");
|
||||
if (String.IsNullOrEmpty(serviceURI))
|
||||
{
|
||||
m_log.Error("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService");
|
||||
throw new Exception("Authentication connector init error");
|
||||
m_log.Info("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService, skipping SimianAuthenticationServiceConnector");
|
||||
return;
|
||||
}
|
||||
|
||||
m_serverUrl = serviceURI;
|
||||
|
|
|
@ -81,15 +81,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
|||
IConfig gridConfig = source.Configs["AvatarService"];
|
||||
if (gridConfig == null)
|
||||
{
|
||||
m_log.Info("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini, skipping SimianAvatarServiceConnector");
|
||||
return;
|
||||
m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini");
|
||||
throw new Exception("Avatar connector init error");
|
||||
}
|
||||
|
||||
string serviceUrl = gridConfig.GetString("AvatarServerURI");
|
||||
if (String.IsNullOrEmpty(serviceUrl))
|
||||
{
|
||||
m_log.Error("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService");
|
||||
throw new Exception("Avatar connector init error");
|
||||
m_log.Info("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService, skipping SimianAvatarServiceConnector");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!serviceUrl.EndsWith("/"))
|
||||
|
|
|
@ -79,15 +79,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
|||
IConfig assetConfig = source.Configs["FriendsService"];
|
||||
if (assetConfig == null)
|
||||
{
|
||||
m_log.Info("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini, skipping SimianFriendsServiceConnector");
|
||||
return;
|
||||
m_log.Error("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini");
|
||||
throw new Exception("Friends connector init error");
|
||||
}
|
||||
|
||||
string serviceURI = assetConfig.GetString("FriendsServerURI");
|
||||
if (String.IsNullOrEmpty(serviceURI))
|
||||
{
|
||||
m_log.Error("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService");
|
||||
throw new Exception("Friends connector init error");
|
||||
m_log.Info("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService, skipping SimianFriendsServiceConnector");
|
||||
return;
|
||||
}
|
||||
|
||||
m_serverUrl = serviceURI;
|
||||
|
|
|
@ -83,15 +83,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
|||
IConfig gridConfig = source.Configs["GridService"];
|
||||
if (gridConfig == null)
|
||||
{
|
||||
m_log.Info("[GRID CONNECTOR]: GridService missing from OpenSim.ini, skipping SimianGridServiceConnector");
|
||||
return;
|
||||
m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini");
|
||||
throw new Exception("Grid connector init error");
|
||||
}
|
||||
|
||||
string serviceUrl = gridConfig.GetString("GridServerURI");
|
||||
if (String.IsNullOrEmpty(serviceUrl))
|
||||
{
|
||||
m_log.Error("[GRID CONNECTOR]: No Server URI named in section GridService");
|
||||
throw new Exception("Grid connector init error");
|
||||
m_log.Info("[GRID CONNECTOR]: No Server URI named in section GridService, skipping SimianGridServiceConnector");
|
||||
return;
|
||||
}
|
||||
|
||||
m_serverUrl = serviceUrl;
|
||||
|
|
|
@ -95,15 +95,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
|||
IConfig gridConfig = source.Configs["InventoryService"];
|
||||
if (gridConfig == null)
|
||||
{
|
||||
m_log.Info("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini, skipping SimianInventoryServiceConnector");
|
||||
return;
|
||||
m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini");
|
||||
throw new Exception("Inventory connector init error");
|
||||
}
|
||||
|
||||
string serviceUrl = gridConfig.GetString("InventoryServerURI");
|
||||
if (String.IsNullOrEmpty(serviceUrl))
|
||||
{
|
||||
m_log.Error("[INVENTORY CONNECTOR]: No Server URI named in section InventoryService");
|
||||
throw new Exception("Inventory connector init error");
|
||||
m_log.Info("[INVENTORY CONNECTOR]: No Server URI named in section InventoryService, skipping SimianInventoryServiceConnector");
|
||||
return;
|
||||
}
|
||||
|
||||
// FIXME: Get the user server URL too
|
||||
|
|
|
@ -107,15 +107,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
|||
IConfig gridConfig = source.Configs["PresenceService"];
|
||||
if (gridConfig == null)
|
||||
{
|
||||
m_log.Info("[PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini, skipping SimianPresenceServiceConnector");
|
||||
return;
|
||||
m_log.Error("[PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini");
|
||||
throw new Exception("Presence connector init error");
|
||||
}
|
||||
|
||||
string serviceUrl = gridConfig.GetString("PresenceServerURI");
|
||||
if (String.IsNullOrEmpty(serviceUrl))
|
||||
{
|
||||
m_log.Error("[PRESENCE CONNECTOR]: No PresenceServerURI in section PresenceService");
|
||||
throw new Exception("Presence connector init error");
|
||||
m_log.Info("[PRESENCE CONNECTOR]: No PresenceServerURI in section PresenceService, skipping SimianPresenceServiceConnector");
|
||||
return;
|
||||
}
|
||||
|
||||
m_serverUrl = serviceUrl;
|
||||
|
|
|
@ -91,15 +91,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
|||
IConfig gridConfig = source.Configs["UserAccountService"];
|
||||
if (gridConfig == null)
|
||||
{
|
||||
m_log.Error("[PROFILES]: UserAccountService missing from OpenSim.ini, skipping SimianProfiles");
|
||||
return;
|
||||
m_log.Error("[PROFILES]: UserAccountService missing from OpenSim.ini");
|
||||
throw new Exception("Profiles init error");
|
||||
}
|
||||
|
||||
string serviceUrl = gridConfig.GetString("UserAccountServerURI");
|
||||
if (String.IsNullOrEmpty(serviceUrl))
|
||||
{
|
||||
m_log.Error("[PROFILES]: No UserAccountServerURI in section UserAccountService");
|
||||
throw new Exception("Profiles init error");
|
||||
m_log.Info("[PROFILES]: No UserAccountServerURI in section UserAccountService, skipping SimianProfiles");
|
||||
return;
|
||||
}
|
||||
|
||||
if (!serviceUrl.EndsWith("/"))
|
||||
|
|
|
@ -80,15 +80,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
|
|||
IConfig assetConfig = source.Configs["UserAccountService"];
|
||||
if (assetConfig == null)
|
||||
{
|
||||
m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini, skipping SimianUserAccountServiceConnector");
|
||||
return;
|
||||
m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini");
|
||||
throw new Exception("User account connector init error");
|
||||
}
|
||||
|
||||
string serviceURI = assetConfig.GetString("UserAccountServerURI");
|
||||
if (String.IsNullOrEmpty(serviceURI))
|
||||
{
|
||||
m_log.Error("[ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService");
|
||||
throw new Exception("User account connector init error");
|
||||
m_log.Info("[ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService, skipping SimianUserAccountServiceConnector");
|
||||
return;
|
||||
}
|
||||
|
||||
m_accountCache = new ExpiringCache<UUID, UserAccount>();
|
||||
|
|
Loading…
Reference in New Issue