From 1096103d66d7391943efa85553f46a633cf0d3ee Mon Sep 17 00:00:00 2001
From: Melanie
Date: Tue, 29 Sep 2009 09:44:12 +0100
Subject: Fix loading modules with alternate configurations and ports into
 ROBUST. Make all current modules support the configuration name option

---
 .../Handlers/Freeswitch/FreeswitchServerConnector.cs       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Server/Handlers/Freeswitch')

diff --git a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs
index a4ab0d3..07bafc8 100644
--- a/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs
+++ b/OpenSim/Server/Handlers/Freeswitch/FreeswitchServerConnector.cs
@@ -37,19 +37,23 @@ namespace OpenSim.Server.Handlers.Freeswitch
     public class FreeswitchServerConnector : ServiceConnector
     {
         private IFreeswitchService m_FreeswitchService;
+        private string m_ConfigName = "FreeswitchService";
 
-        public FreeswitchServerConnector(IConfigSource config, IHttpServer server) :
-                base(config, server)
+        public FreeswitchServerConnector(IConfigSource config, IHttpServer server, string configName) :
+                base(config, server, configName)
         {
-            IConfig serverConfig = config.Configs["FreeswitchService"];
+            if (configName != String.Empty)
+                m_ConfigName = configName;
+
+            IConfig serverConfig = config.Configs[m_ConfigName];
             if (serverConfig == null)
-                throw new Exception("No section 'Server' in config file");
+                throw new Exception(String.Format("No section '{0}' in config file", m_ConfigName));
 
             string freeswitchService = serverConfig.GetString("LocalServiceModule",
                     String.Empty);
 
             if (freeswitchService == String.Empty)
-                throw new Exception("No FreeswitchService in config file");
+                throw new Exception("No LocalServiceModule in config file");
 
             Object[] args = new Object[] { config };
             m_FreeswitchService =
-- 
cgit v1.1