aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJohn Hurliman2010-03-12 13:28:16 -0800
committerJohn Hurliman2010-03-12 13:28:16 -0800
commit9e3cdc4da5483ce0187c7774fa274e99845da232 (patch)
treea42f66beead72d659d4860448354607a7e5fdc7a
parentFixed SimianGrid connectors to gracefully exit if the required config section... (diff)
downloadopensim-SC_OLD-9e3cdc4da5483ce0187c7774fa274e99845da232.zip
opensim-SC_OLD-9e3cdc4da5483ce0187c7774fa274e99845da232.tar.gz
opensim-SC_OLD-9e3cdc4da5483ce0187c7774fa274e99845da232.tar.bz2
opensim-SC_OLD-9e3cdc4da5483ce0187c7774fa274e99845da232.tar.xz
Fixing the previous patch to work correctly with standalone mode
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs8
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAuthenticationServiceConnector.cs8
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianAvatarServiceConnector.cs8
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs8
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianGridServiceConnector.cs8
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianInventoryServiceConnector.cs8
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs8
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs8
-rw-r--r--OpenSim/Services/Connectors/SimianGrid/SimianUserAccountServiceConnector.cs8
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
88 IConfig gridConfig = source.Configs["AssetService"]; 88 IConfig gridConfig = source.Configs["AssetService"];
89 if (gridConfig == null) 89 if (gridConfig == null)
90 { 90 {
91 m_log.Info("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini, skipping SimianAssetServiceConnector"); 91 m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini");
92 return; 92 throw new Exception("Asset connector init error");
93 } 93 }
94 94
95 string serviceUrl = gridConfig.GetString("AssetServerURI"); 95 string serviceUrl = gridConfig.GetString("AssetServerURI");
96 if (String.IsNullOrEmpty(serviceUrl)) 96 if (String.IsNullOrEmpty(serviceUrl))
97 { 97 {
98 m_log.Error("[ASSET CONNECTOR]: No AssetServerURI in section AssetService"); 98 m_log.Info("[ASSET CONNECTOR]: No AssetServerURI in section AssetService, skipping SimianAssetServiceConnector");
99 throw new Exception("Asset connector init error"); 99 return;
100 } 100 }
101 101
102 if (!serviceUrl.EndsWith("/")) 102 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
76 IConfig assetConfig = source.Configs["AuthenticationService"]; 76 IConfig assetConfig = source.Configs["AuthenticationService"];
77 if (assetConfig == null) 77 if (assetConfig == null)
78 { 78 {
79 m_log.Info("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini, skipping SimianAuthenticationServiceConnector"); 79 m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini");
80 return; 80 throw new Exception("Authentication connector init error");
81 } 81 }
82 82
83 string serviceURI = assetConfig.GetString("AuthenticationServerURI"); 83 string serviceURI = assetConfig.GetString("AuthenticationServerURI");
84 if (String.IsNullOrEmpty(serviceURI)) 84 if (String.IsNullOrEmpty(serviceURI))
85 { 85 {
86 m_log.Error("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService"); 86 m_log.Info("[AUTH CONNECTOR]: No Server URI named in section AuthenticationService, skipping SimianAuthenticationServiceConnector");
87 throw new Exception("Authentication connector init error"); 87 return;
88 } 88 }
89 89
90 m_serverUrl = serviceURI; 90 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
81 IConfig gridConfig = source.Configs["AvatarService"]; 81 IConfig gridConfig = source.Configs["AvatarService"];
82 if (gridConfig == null) 82 if (gridConfig == null)
83 { 83 {
84 m_log.Info("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini, skipping SimianAvatarServiceConnector"); 84 m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini");
85 return; 85 throw new Exception("Avatar connector init error");
86 } 86 }
87 87
88 string serviceUrl = gridConfig.GetString("AvatarServerURI"); 88 string serviceUrl = gridConfig.GetString("AvatarServerURI");
89 if (String.IsNullOrEmpty(serviceUrl)) 89 if (String.IsNullOrEmpty(serviceUrl))
90 { 90 {
91 m_log.Error("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService"); 91 m_log.Info("[AVATAR CONNECTOR]: No AvatarServerURI in section AvatarService, skipping SimianAvatarServiceConnector");
92 throw new Exception("Avatar connector init error"); 92 return;
93 } 93 }
94 94
95 if (!serviceUrl.EndsWith("/")) 95 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
79 IConfig assetConfig = source.Configs["FriendsService"]; 79 IConfig assetConfig = source.Configs["FriendsService"];
80 if (assetConfig == null) 80 if (assetConfig == null)
81 { 81 {
82 m_log.Info("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini, skipping SimianFriendsServiceConnector"); 82 m_log.Error("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini");
83 return; 83 throw new Exception("Friends connector init error");
84 } 84 }
85 85
86 string serviceURI = assetConfig.GetString("FriendsServerURI"); 86 string serviceURI = assetConfig.GetString("FriendsServerURI");
87 if (String.IsNullOrEmpty(serviceURI)) 87 if (String.IsNullOrEmpty(serviceURI))
88 { 88 {
89 m_log.Error("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService"); 89 m_log.Info("[FRIENDS CONNECTOR]: No Server URI named in section FriendsService, skipping SimianFriendsServiceConnector");
90 throw new Exception("Friends connector init error"); 90 return;
91 } 91 }
92 92
93 m_serverUrl = serviceURI; 93 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
83 IConfig gridConfig = source.Configs["GridService"]; 83 IConfig gridConfig = source.Configs["GridService"];
84 if (gridConfig == null) 84 if (gridConfig == null)
85 { 85 {
86 m_log.Info("[GRID CONNECTOR]: GridService missing from OpenSim.ini, skipping SimianGridServiceConnector"); 86 m_log.Error("[GRID CONNECTOR]: GridService missing from OpenSim.ini");
87 return; 87 throw new Exception("Grid connector init error");
88 } 88 }
89 89
90 string serviceUrl = gridConfig.GetString("GridServerURI"); 90 string serviceUrl = gridConfig.GetString("GridServerURI");
91 if (String.IsNullOrEmpty(serviceUrl)) 91 if (String.IsNullOrEmpty(serviceUrl))
92 { 92 {
93 m_log.Error("[GRID CONNECTOR]: No Server URI named in section GridService"); 93 m_log.Info("[GRID CONNECTOR]: No Server URI named in section GridService, skipping SimianGridServiceConnector");
94 throw new Exception("Grid connector init error"); 94 return;
95 } 95 }
96 96
97 m_serverUrl = serviceUrl; 97 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
95 IConfig gridConfig = source.Configs["InventoryService"]; 95 IConfig gridConfig = source.Configs["InventoryService"];
96 if (gridConfig == null) 96 if (gridConfig == null)
97 { 97 {
98 m_log.Info("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini, skipping SimianInventoryServiceConnector"); 98 m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini");
99 return; 99 throw new Exception("Inventory connector init error");
100 } 100 }
101 101
102 string serviceUrl = gridConfig.GetString("InventoryServerURI"); 102 string serviceUrl = gridConfig.GetString("InventoryServerURI");
103 if (String.IsNullOrEmpty(serviceUrl)) 103 if (String.IsNullOrEmpty(serviceUrl))
104 { 104 {
105 m_log.Error("[INVENTORY CONNECTOR]: No Server URI named in section InventoryService"); 105 m_log.Info("[INVENTORY CONNECTOR]: No Server URI named in section InventoryService, skipping SimianInventoryServiceConnector");
106 throw new Exception("Inventory connector init error"); 106 return;
107 } 107 }
108 108
109 // FIXME: Get the user server URL too 109 // 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
107 IConfig gridConfig = source.Configs["PresenceService"]; 107 IConfig gridConfig = source.Configs["PresenceService"];
108 if (gridConfig == null) 108 if (gridConfig == null)
109 { 109 {
110 m_log.Info("[PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini, skipping SimianPresenceServiceConnector"); 110 m_log.Error("[PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini");
111 return; 111 throw new Exception("Presence connector init error");
112 } 112 }
113 113
114 string serviceUrl = gridConfig.GetString("PresenceServerURI"); 114 string serviceUrl = gridConfig.GetString("PresenceServerURI");
115 if (String.IsNullOrEmpty(serviceUrl)) 115 if (String.IsNullOrEmpty(serviceUrl))
116 { 116 {
117 m_log.Error("[PRESENCE CONNECTOR]: No PresenceServerURI in section PresenceService"); 117 m_log.Info("[PRESENCE CONNECTOR]: No PresenceServerURI in section PresenceService, skipping SimianPresenceServiceConnector");
118 throw new Exception("Presence connector init error"); 118 return;
119 } 119 }
120 120
121 m_serverUrl = serviceUrl; 121 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
91 IConfig gridConfig = source.Configs["UserAccountService"]; 91 IConfig gridConfig = source.Configs["UserAccountService"];
92 if (gridConfig == null) 92 if (gridConfig == null)
93 { 93 {
94 m_log.Error("[PROFILES]: UserAccountService missing from OpenSim.ini, skipping SimianProfiles"); 94 m_log.Error("[PROFILES]: UserAccountService missing from OpenSim.ini");
95 return; 95 throw new Exception("Profiles init error");
96 } 96 }
97 97
98 string serviceUrl = gridConfig.GetString("UserAccountServerURI"); 98 string serviceUrl = gridConfig.GetString("UserAccountServerURI");
99 if (String.IsNullOrEmpty(serviceUrl)) 99 if (String.IsNullOrEmpty(serviceUrl))
100 { 100 {
101 m_log.Error("[PROFILES]: No UserAccountServerURI in section UserAccountService"); 101 m_log.Info("[PROFILES]: No UserAccountServerURI in section UserAccountService, skipping SimianProfiles");
102 throw new Exception("Profiles init error"); 102 return;
103 } 103 }
104 104
105 if (!serviceUrl.EndsWith("/")) 105 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
80 IConfig assetConfig = source.Configs["UserAccountService"]; 80 IConfig assetConfig = source.Configs["UserAccountService"];
81 if (assetConfig == null) 81 if (assetConfig == null)
82 { 82 {
83 m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini, skipping SimianUserAccountServiceConnector"); 83 m_log.Error("[ACCOUNT CONNECTOR]: UserAccountService missing from OpenSim.ini");
84 return; 84 throw new Exception("User account connector init error");
85 } 85 }
86 86
87 string serviceURI = assetConfig.GetString("UserAccountServerURI"); 87 string serviceURI = assetConfig.GetString("UserAccountServerURI");
88 if (String.IsNullOrEmpty(serviceURI)) 88 if (String.IsNullOrEmpty(serviceURI))
89 { 89 {
90 m_log.Error("[ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService"); 90 m_log.Info("[ACCOUNT CONNECTOR]: No UserAccountServerURI in section UserAccountService, skipping SimianUserAccountServiceConnector");
91 throw new Exception("User account connector init error"); 91 return;
92 } 92 }
93 93
94 m_accountCache = new ExpiringCache<UUID, UserAccount>(); 94 m_accountCache = new ExpiringCache<UUID, UserAccount>();