[Freeswitch-trunk] [commit] r12860 - in freeswitch/trunk/src/mod/languages: mod_lua mod_perl mod_python mod_spidermonkey
FreeSWITCH SVN
anthm at freeswitch.org
Tue Mar 31 16:56:47 PDT 2009
Author: anthm
Date: Tue Mar 31 18:56:47 2009
New Revision: 12860
Log:
remove old code
Modified:
freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp
freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c
freeswitch/trunk/src/mod/languages/mod_python/mod_python.c
freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
Modified: freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp (original)
+++ freeswitch/trunk/src/mod/languages/mod_lua/mod_lua.cpp Tue Mar 31 18:56:47 2009
@@ -438,38 +438,11 @@
return SWITCH_STATUS_SUCCESS;
}
-static void message_query_handler(switch_event_t *event)
-{
- char *account = switch_event_get_header(event, "message-account");
-
- if (account) {
- char *path, *cmd;
-
- path = switch_mprintf("%s%smwi.lua", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR);
- switch_assert(path != NULL);
-
- if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) {
- cmd = switch_mprintf("%s %s", path, account);
- switch_assert(cmd != NULL);
- lua_thread(cmd);
- switch_safe_free(cmd);
- }
-
- switch_safe_free(path);
- }
-}
-
SWITCH_MODULE_LOAD_FUNCTION(mod_lua_load)
{
switch_api_interface_t *api_interface;
switch_application_interface_t *app_interface;
- if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node)
- != SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
- return SWITCH_STATUS_GENERR;
- }
-
/* connect my internal structure to the blank pointer passed to me */
*module_interface = switch_loadable_module_create_module_interface(pool, modname);
Modified: freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c (original)
+++ freeswitch/trunk/src/mod/languages/mod_perl/mod_perl.c Tue Mar 31 18:56:47 2009
@@ -429,24 +429,6 @@
return xml;
}
-static void message_query_handler(switch_event_t *event)
-{
- char *account = switch_event_get_header(event, "message-account");
-
- if (account) {
- char path[512], *cmd;
-
- switch_snprintf(path, sizeof(path), "%s%smwi.pl", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR);
-
- if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) {
- cmd = switch_mprintf("%s %s", path, account);
- switch_assert(cmd != NULL);
- perl_thread(cmd);
- switch_safe_free(cmd);
- }
- }
-}
-
static switch_status_t do_config(void)
{
char *cf = "perl.conf";
@@ -491,12 +473,6 @@
globals.pool = pool;
- if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node)
- != SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
- return SWITCH_STATUS_GENERR;
- }
-
if (!(my_perl = perl_alloc())) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not allocate perl interpreter\n");
return SWITCH_STATUS_MEMERR;
Modified: freeswitch/trunk/src/mod/languages/mod_python/mod_python.c
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_python/mod_python.c (original)
+++ freeswitch/trunk/src/mod/languages/mod_python/mod_python.c Tue Mar 31 18:56:47 2009
@@ -333,26 +333,6 @@
return 0;
}
-static void message_query_handler(switch_event_t *event)
-{
- char *account = switch_event_get_header(event, "message-account");
-
- if (account) {
- char *path, *cmd;
-
- path = switch_mprintf("%s%smwi.py", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR);
- switch_assert(path != NULL);
-
- if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) {
- cmd = switch_mprintf("%s %s", path, account);
- switch_assert(cmd != NULL);
- py_thread(cmd);
- switch_safe_free(cmd);
- }
- switch_safe_free(path);
- }
-}
-
SWITCH_STANDARD_API(launch_python)
{
@@ -372,12 +352,6 @@
switch_application_interface_t *app_interface;
char *pp = getenv("PYTHONPATH");
- if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node)
- != SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
- return SWITCH_STATUS_GENERR;
- }
-
if (pp) {
char *path = switch_mprintf("%s:%s", pp, SWITCH_GLOBAL_dirs.script_dir);
setenv("PYTHONPATH", path, 1);
Modified: freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c
==============================================================================
--- freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c (original)
+++ freeswitch/trunk/src/mod/languages/mod_spidermonkey/mod_spidermonkey.c Tue Mar 31 18:56:47 2009
@@ -3695,27 +3695,6 @@
return SWITCH_STATUS_SUCCESS;
}
-static void message_query_handler(switch_event_t *event)
-{
- char *account = switch_event_get_header(event, "message-account");
-
- if (account) {
- char *path, *cmd;
-
- path = switch_mprintf("%s%smwi.js", SWITCH_GLOBAL_dirs.script_dir, SWITCH_PATH_SEPARATOR);
- switch_assert(path != NULL);
-
- if (switch_file_exists(path, NULL) == SWITCH_STATUS_SUCCESS) {
- cmd = switch_mprintf("%s %s", path, account);
- switch_assert(cmd != NULL);
- js_thread_launch(cmd);
- switch_safe_free(cmd);
- }
-
- switch_safe_free(path);
- }
-}
-
SWITCH_MODULE_LOAD_FUNCTION(mod_spidermonkey_load)
{
switch_application_interface_t *app_interface;
@@ -3725,12 +3704,6 @@
return status;
}
- if (switch_event_bind_removable(modname, SWITCH_EVENT_MESSAGE_QUERY, SWITCH_EVENT_SUBCLASS_ANY, message_query_handler, NULL, &globals.node)
- != SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Couldn't bind!\n");
- return SWITCH_STATUS_GENERR;
- }
-
/* connect my internal structure to the blank pointer passed to me */
*module_interface = switch_loadable_module_create_module_interface(pool, modname);
SWITCH_ADD_API(js_run_interface, "jsrun", "run a script", launch_async, "jsrun <script> [additional_vars [...]]");
More information about the Freeswitch-trunk
mailing list