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

Fixing the previous patch to work correctly with standalone mode

slimupdates
John Hurliman 2010-03-12 13:28:16 -08:00
parent 0b5141d45b
commit 9e3cdc4da5
9 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
View File

@ -88,15 +88,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
IConfig gridConfig = source.Configs["AssetService"]; IConfig gridConfig = source.Configs["AssetService"];
if (gridConfig == null) if (gridConfig == null)
{ {
m_log.Info("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini, skipping SimianAssetServiceConnector"); m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini");
return; throw new Exception("Asset connector init error");
} }
string serviceUrl = gridConfig.GetString("AssetServerURI"); string serviceUrl = gridConfig.GetString("AssetServerURI");
if (String.IsNullOrEmpty(serviceUrl)) if (String.IsNullOrEmpty(serviceUrl))
{ {
m_log.Error("[ASSET CONNECTOR]: No AssetServerURI in section AssetService"); m_log.Info("[ASSET CONNECTOR]: No AssetServerURI in section AssetService, skipping SimianAssetServiceConnector");
throw new Exception("Asset connector init error"); return;
} }
if (!serviceUrl.EndsWith("/")) if (!serviceUrl.EndsWith("/"))

8
OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
View File

@ -76,15 +76,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
IConfig assetConfig = source.Configs["AuthenticationService"]; IConfig assetConfig = source.Configs["AuthenticationService"];
if (assetConfig == null) if (assetConfig == null)
{ {
m_log.Info("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini, skipping SimianAuthenticationServiceConnector"); m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini");
return; throw new Exception("Authentication connector init error");
} }
string serviceURI = assetConfig.GetString("AuthenticationServerURI"); string serviceURI = assetConfig.GetString("AuthenticationServerURI");
if (String.IsNullOrEmpty(serviceURI)) if (String.IsNullOrEmpty(serviceURI))
{ {
m_log.Error("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService"); m_log.Info("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService, skipping SimianAuthenticationServiceConnector");
throw new Exception("Authentication connector init error"); return;
} }
m_serverUrl = serviceURI; m_serverUrl = serviceURI;

8
OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
View File

@ -81,15 +81,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
IConfig gridConfig = source.Configs["AvatarService"]; IConfig gridConfig = source.Configs["AvatarService"];
if (gridConfig == null) if (gridConfig == null)
{ {
m_log.Info("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini, skipping SimianAvatarServiceConnector"); m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini");
return; throw new Exception("Avatar connector init error");
} }
string serviceUrl = gridConfig.GetString("AvatarServerURI"); string serviceUrl = gridConfig.GetString("AvatarServerURI");
if (String.IsNullOrEmpty(serviceUrl)) if (String.IsNullOrEmpty(serviceUrl))
{ {
m_log.Error("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService"); m_log.Info("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService, skipping SimianAvatarServiceConnector");
throw new Exception("Avatar connector init error"); return;
} }
if (!serviceUrl.EndsWith("/")) if (!serviceUrl.EndsWith("/"))

8
OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
View File

@ -79,15 +79,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
IConfig assetConfig = source.Configs["FriendsService"]; IConfig assetConfig = source.Configs["FriendsService"];
if (assetConfig == null) if (assetConfig == null)
{ {
m_log.Info("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini, skipping SimianFriendsServiceConnector"); m_log.Error("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini");
return; throw new Exception("Friends connector init error");
} }
string serviceURI = assetConfig.GetString("FriendsServerURI"); string serviceURI = assetConfig.GetString("FriendsServerURI");
if (String.IsNullOrEmpty(serviceURI)) if (String.IsNullOrEmpty(serviceURI))
{ {
m_log.Error("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService"); m_log.Info("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService, skipping SimianFriendsServiceConnector");
throw new Exception("Friends connector init error"); return;
} }
m_serverUrl = serviceURI; m_serverUrl = serviceURI;

8
OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
View File

@ -83,15 +83,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
IConfig gridConfig = source.Configs["GridService"]; IConfig gridConfig = source.Configs["GridService"];
if (gridConfig == null) if (gridConfig == null)
{ {
m_log.Info("[GRID CONNECTOR]: GridService missing from OpenSim.ini, skipping SimianGridServiceConnector"); m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini");
return; throw new Exception("Grid connector init error");
} }
string serviceUrl = gridConfig.GetString("GridServerURI"); string serviceUrl = gridConfig.GetString("GridServerURI");
if (String.IsNullOrEmpty(serviceUrl)) if (String.IsNullOrEmpty(serviceUrl))
{ {
m_log.Error("[GRID CONNECTOR]: No Server URI named in section GridService"); m_log.Info("[GRID CONNECTOR]: No Server URI named in section GridService, skipping SimianGridServiceConnector");
throw new Exception("Grid connector init error"); return;
} }
m_serverUrl = serviceUrl; m_serverUrl = serviceUrl;

8
OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
View File

@ -95,15 +95,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
IConfig gridConfig = source.Configs["InventoryService"]; IConfig gridConfig = source.Configs["InventoryService"];
if (gridConfig == null) if (gridConfig == null)
{ {
m_log.Info("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini, skipping SimianInventoryServiceConnector"); m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini");
return; throw new Exception("Inventory connector init error");
} }
string serviceUrl = gridConfig.GetString("InventoryServerURI"); string serviceUrl = gridConfig.GetString("InventoryServerURI");
if (String.IsNullOrEmpty(serviceUrl)) if (String.IsNullOrEmpty(serviceUrl))
{ {
m_log.Error("[INVENTORY CONNECTOR]: No Server URI named in section InventoryService"); m_log.Info("[INVENTORY CONNECTOR]: No Server URI named in section InventoryService, skipping SimianInventoryServiceConnector");
throw new Exception("Inventory connector init error"); return;
} }
// FIXME: Get the user server URL too // FIXME: Get the user server URL too

8
OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
View File

@ -107,15 +107,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
IConfig gridConfig = source.Configs["PresenceService"]; IConfig gridConfig = source.Configs["PresenceService"];
if (gridConfig == null) if (gridConfig == null)
{ {
m_log.Info("[PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini, skipping SimianPresenceServiceConnector"); m_log.Error("[PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini");
return; throw new Exception("Presence connector init error");
} }
string serviceUrl = gridConfig.GetString("PresenceServerURI"); string serviceUrl = gridConfig.GetString("PresenceServerURI");
if (String.IsNullOrEmpty(serviceUrl)) if (String.IsNullOrEmpty(serviceUrl))
{ {
m_log.Error("[PRESENCE CONNECTOR]: No PresenceServerURI in section PresenceService"); m_log.Info("[PRESENCE CONNECTOR]: No PresenceServerURI in section PresenceService, skipping SimianPresenceServiceConnector");
throw new Exception("Presence connector init error"); return;
} }
m_serverUrl = serviceUrl; m_serverUrl = serviceUrl;

8
OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
View File

@ -91,15 +91,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
IConfig gridConfig = source.Configs["UserAccountService"]; IConfig gridConfig = source.Configs["UserAccountService"];
if (gridConfig == null) if (gridConfig == null)
{ {
m_log.Error("[PROFILES]: UserAccountService missing from OpenSim.ini, skipping SimianProfiles"); m_log.Error("[PROFILES]: UserAccountService missing from OpenSim.ini");
return; throw new Exception("Profiles init error");
} }
string serviceUrl = gridConfig.GetString("UserAccountServerURI"); string serviceUrl = gridConfig.GetString("UserAccountServerURI");
if (String.IsNullOrEmpty(serviceUrl)) if (String.IsNullOrEmpty(serviceUrl))
{ {
m_log.Error("[PROFILES]: No UserAccountServerURI in section UserAccountService"); m_log.Info("[PROFILES]: No UserAccountServerURI in section UserAccountService, skipping SimianProfiles");
throw new Exception("Profiles init error"); return;
} }
if (!serviceUrl.EndsWith("/")) if (!serviceUrl.EndsWith("/"))

8
OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
View File

@ -80,15 +80,15 @@ namespace OpenSim.Services.Connectors.SimianGrid
IConfig assetConfig = source.Configs["UserAccountService"]; IConfig assetConfig = source.Configs["UserAccountService"];
if (assetConfig == null) if (assetConfig == null)
{ {
m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini, skipping SimianUserAccountServiceConnector"); m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini");
return; throw new Exception("User account connector init error");
} }
string serviceURI = assetConfig.GetString("UserAccountServerURI"); string serviceURI = assetConfig.GetString("UserAccountServerURI");
if (String.IsNullOrEmpty(serviceURI)) if (String.IsNullOrEmpty(serviceURI))
{ {
m_log.Error("[ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService"); m_log.Info("[ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService, skipping SimianUserAccountServiceConnector");
throw new Exception("User account connector init error"); return;
} }
m_accountCache = new ExpiringCache<UUID, UserAccount>(); m_accountCache = new ExpiringCache<UUID, UserAccount>();