Prevent unloading of embedded languages modules (also fixes MODLANG-121)

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@14491 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/languages/mod_java/modjava.c b/src/mod/languages/mod_java/modjava.c
index 90b492004b04264fa49b906d5af62683f8c62930..4730fa30c5483f8e586997784c32cd01f8a63bfc 100644 (file)
--- a/src/mod/languages/mod_java/modjava.c
+++ b/src/mod/languages/mod_java/modjava.c
@@ -261,7 +261,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_java_load)
     }
     else
         switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error creating memory pool\n");
-    return status;
+
+    return status == SWITCH_STATUS_SUCCESS ? SWITCH_STATUS_NOUNLOAD : status;
 }
 
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_java_shutdown)

diff --git a/src/mod/languages/mod_lua/mod_lua.cpp b/src/mod/languages/mod_lua/mod_lua.cpp
index 0f9ab16c7679f14d8bf90c9a9246693f0f89926d..6d4e369457b5b6637252df07562fa8557c0ab2b3 100644 (file)
--- a/src/mod/languages/mod_lua/mod_lua.cpp
+++ b/src/mod/languages/mod_lua/mod_lua.cpp
@@ -462,7 +462,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_lua_load)
        do_config();
 
        /* indicate that the module should continue to be loaded */
-       return SWITCH_STATUS_SUCCESS;
+       return SWITCH_STATUS_NOUNLOAD;
 }
 
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_lua_shutdown)

diff --git a/src/mod/languages/mod_managed/mod_managed.cpp b/src/mod/languages/mod_managed/mod_managed.cpp
index 3ac2aa9dccc1c39b2982218120cd66e2f1f05a7c..0fab00fe6498f66628674618a5d3b3515c400d76 100644 (file)
--- a/src/mod/languages/mod_managed/mod_managed.cpp
+++ b/src/mod/languages/mod_managed/mod_managed.cpp
@@ -363,7 +363,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_managed_load)
        SWITCH_ADD_API(api_interface, "managed", "Run a module as an API function (Execute)", managed_api_function, "<module> [<args>]");\r
        SWITCH_ADD_APP(app_interface, "managed", "Run CLI App", "Run an App on a channel", managed_app_function, "<modulename> [<args>]", SAF_NONE);\r
        SWITCH_ADD_API(api_interface, "managedreload", "Force [re]load of a file", managedreload_api_function, "<filename>");\r
-       return SWITCH_STATUS_SUCCESS;\r
+       return SWITCH_STATUS_NOUNLOAD;\r
 }\r
 \r
 #ifdef _MANAGED\r

diff --git a/src/mod/languages/mod_perl/mod_perl.c b/src/mod/languages/mod_perl/mod_perl.c
index 0b40abf918f6477ccb70eaaf89515e8688f1a54c..d0a6bbe03c3794e8f47c83f86025c75bd23ace67 100644 (file)
--- a/src/mod/languages/mod_perl/mod_perl.c
+++ b/src/mod/languages/mod_perl/mod_perl.c
@@ -493,7 +493,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_perl_load)
 
        do_config();
 
-       return SWITCH_STATUS_SUCCESS;
+       return SWITCH_STATUS_NOUNLOAD;
 }
 
 /* For Emacs:

diff --git a/src/mod/languages/mod_python/mod_python.c b/src/mod/languages/mod_python/mod_python.c
index 0df273e1e74562036913e1caef37805390711966..de23351e6d7380feec40332c567f1ce5ce02e647 100644 (file)
--- a/src/mod/languages/mod_python/mod_python.c
+++ b/src/mod/languages/mod_python/mod_python.c
@@ -426,7 +426,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_python_load)
                                   SAF_SUPPORT_NOMEDIA);
 
        /* indicate that the module should continue to be loaded */
-       return SWITCH_STATUS_SUCCESS;
+       return SWITCH_STATUS_NOUNLOAD;
 }
 
 /*

diff --git a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
index 76c957778f1468e6b8e954ed863449f615289986..f382fb442bd79ef69fc8121d07fece41439ffdfa 100644 (file)
--- a/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
+++ b/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
@@ -3751,7 +3751,7 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load)
        curl_global_init(CURL_GLOBAL_ALL);
 
        /* indicate that the module should continue to be loaded */
-       return SWITCH_STATUS_SUCCESS;
+       return SWITCH_STATUS_NOUNLOAD;
 }
 
 SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_spidermonkey_shutdown)