diff options
author | John Hurliman | 2010-03-12 13:16:44 -0800 |
---|---|---|
committer | John Hurliman | 2010-03-12 13:16:44 -0800 |
commit | 0b5141d45bcd409544e909aedabc3e58e6a86a13 (patch) | |
tree | 6566ee2dd669e05584869436bc174590c37bbcd5 /OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs | |
parent | Simplify database setup and remove migration problems by moving all sqlite co... (diff) | |
download | opensim-SC_OLD-0b5141d45bcd409544e909aedabc3e58e6a86a13.zip opensim-SC_OLD-0b5141d45bcd409544e909aedabc3e58e6a86a13.tar.gz opensim-SC_OLD-0b5141d45bcd409544e909aedabc3e58e6a86a13.tar.bz2 opensim-SC_OLD-0b5141d45bcd409544e909aedabc3e58e6a86a13.tar.xz |
Fixed SimianGrid connectors to gracefully exit if the required config sections are missing
Diffstat (limited to 'OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs index 856381d..a569e91 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianFriendsServiceConnector.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
47 | /// Stores and retrieves friend lists from the SimianGrid backend | 47 | /// Stores and retrieves friend lists from the SimianGrid backend |
48 | /// </summary> | 48 | /// </summary> |
49 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 49 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] |
50 | public class SimianFriendsServiceConnector : IFriendsService | 50 | public class SimianFriendsServiceConnector : IFriendsService, ISharedRegionModule |
51 | { | 51 | { |
52 | private static readonly ILog m_log = | 52 | private static readonly ILog m_log = |
53 | LogManager.GetLogger( | 53 | LogManager.GetLogger( |
@@ -64,8 +64,8 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
64 | 64 | ||
65 | public SimianFriendsServiceConnector() { } | 65 | public SimianFriendsServiceConnector() { } |
66 | public string Name { get { return "SimianFriendsServiceConnector"; } } | 66 | public string Name { get { return "SimianFriendsServiceConnector"; } } |
67 | public void AddRegion(Scene scene) { scene.RegisterModuleInterface<IFriendsService>(this); } | 67 | public void AddRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.RegisterModuleInterface<IFriendsService>(this); } } |
68 | public void RemoveRegion(Scene scene) { scene.UnregisterModuleInterface<IFriendsService>(this); } | 68 | public void RemoveRegion(Scene scene) { if (!String.IsNullOrEmpty(m_serverUrl)) { scene.UnregisterModuleInterface<IFriendsService>(this); } } |
69 | 69 | ||
70 | #endregion ISharedRegionModule | 70 | #endregion ISharedRegionModule |
71 | 71 | ||
@@ -79,8 +79,8 @@ 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.Error("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini"); | 82 | m_log.Info("[FRIENDS CONNECTOR]: FriendsService missing from OpenSim.ini, skipping SimianFriendsServiceConnector"); |
83 | throw new Exception("Friends connector init error"); | 83 | return; |
84 | } | 84 | } |
85 | 85 | ||
86 | string serviceURI = assetConfig.GetString("FriendsServerURI"); | 86 | string serviceURI = assetConfig.GetString("FriendsServerURI"); |