kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

More robust loading; make demo more clear 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14405 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Giagnocavo 2009-07-29 02:08:47 +00:00
parent e3f4cb6e93
commit db20243dfe
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/languages/mod_managed/managed/Demo.cs → src/mod/languages/mod_managed/managed/Demo.csx
View File

@ -32,7 +32,7 @@
// How to test the demo (in the mod/managed directory): // How to test the demo (in the mod/managed directory):
// -- Compile to dll for "normal" loading // -- Compile to dll for "normal" loading
// -- Compile to exe for script EXE loading // -- Compile to exe for script EXE loading
// -- Rename to demo.csx for dynamic compilation // -- Copy to managed directory for dynamic compilation
using System; using System;
using FreeSWITCH; using FreeSWITCH;
@ -85,7 +85,7 @@ public class LoadDemo : ILoadNotificationPlugin {
public class ScriptDemo { public class ScriptDemo {
static void Main() { public static void Main() {
switch (FreeSWITCH.Script.ContextType) { switch (FreeSWITCH.Script.ContextType) {
case ScriptContextType.Api: { case ScriptContextType.Api: {
var ctx = FreeSWITCH.Script.GetApiContext(); var ctx = FreeSWITCH.Script.GetApiContext();

2
src/mod/languages/mod_managed/managed/FreeSWITCH.Managed.csproj
View File

@ -52,7 +52,7 @@
<Compile Include="Loader.cs" /> <Compile Include="Loader.cs" />
<Compile Include="Extensions.cs" /> <Compile Include="Extensions.cs" />
<Compile Include="Log.cs" /> <Compile Include="Log.cs" />
<None Include="Demo.cs" /> <None Include="Demo.csx" />
<Compile Include="PluginInterfaces.cs" /> <Compile Include="PluginInterfaces.cs" />
<Compile Include="PluginManager.cs" /> <Compile Include="PluginManager.cs" />
<Compile Include="ScriptPluginManager.cs" /> <Compile Include="ScriptPluginManager.cs" />

17
src/mod/languages/mod_managed/managed/Loader.cs
View File

@ -219,15 +219,24 @@ namespace FreeSWITCH {
setup.ApplicationName = Path.GetFileName(fileName) + "_" + appDomainCount; setup.ApplicationName = Path.GetFileName(fileName) + "_" + appDomainCount;
var domain = AppDomain.CreateDomain(setup.ApplicationName, null, setup); var domain = AppDomain.CreateDomain(setup.ApplicationName, null, setup);
var pm = (PluginManager)domain.CreateInstanceAndUnwrap(pmType.Assembly.FullName, pmType.FullName, null); PluginManager pm;
if (!pm.Load(fileName)) { try {
pm = (PluginManager)domain.CreateInstanceAndUnwrap(pmType.Assembly.FullName, pmType.FullName, null);
if (!pm.Load(fileName)) {
AppDomain.Unload(domain);
unloadFile(fileName);
return;
}
} catch (Exception ex) {
// On an exception, we will unload the current file so an old copy doesnt stay active
Log.WriteLine(LogLevel.Alert, "Exception loading {0}: {1}", fileName, ex.ToString());
AppDomain.Unload(domain); AppDomain.Unload(domain);
unloadFile(fileName); unloadFile(fileName);
return; return;
} }
// Update dictionaries atomically
lock (loaderLock) { lock (loaderLock) {
// Update dictionaries atomically
unloadFile(fileName); unloadFile(fileName);
var pi = new PluginInfo { FileName = fileName, Domain = domain, Manager = pm }; var pi = new PluginInfo { FileName = fileName, Domain = domain, Manager = pm };
@ -279,7 +288,7 @@ namespace FreeSWITCH {
AppDomain.Unload(d); AppDomain.Unload(d);
Log.WriteLine(LogLevel.Info, "Unloaded {0}, domain {1}.", pi.FileName, friendlyName); Log.WriteLine(LogLevel.Info, "Unloaded {0}, domain {1}.", pi.FileName, friendlyName);
} catch (Exception ex) { } catch (Exception ex) {
Log.WriteLine(LogLevel.Critical, "Could not unload {0}, domain {1}: {2}", pi.FileName, friendlyName, ex.ToString()); Log.WriteLine(LogLevel.Alert, "Could not unload {0}, domain {1}: {2}", pi.FileName, friendlyName, ex.ToString());
} }
}); });
t.Priority = System.Threading.ThreadPriority.BelowNormal; t.Priority = System.Threading.ThreadPriority.BelowNormal;