Fixing the previous patch to work correctly with standalone mode

9 files changed, 36 insertions, 36 deletions

diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
index 89aa911..3f00534 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
@@ -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("/"))
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
index 55aca36..0876efb 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs
@@ -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;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
index b5cef0c..697bb43 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs
@@ -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("/"))
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
index a569e91..abb98a3 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs
@@ -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;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
index 2e600f0..ef943ec 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs
@@ -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;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
index a50ecbc..a41e493 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs
@@ -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
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
index 542093f..fa387ba 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs
@@ -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;
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
index b3b171c..3c93725 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs
@@ -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("/"))
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
index 855b213..3a35d9a 100644
--- a/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
+++ b/OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs
@@ -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>();