MODLANG-105

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

diff --git a/conf/autoload_configs/python.conf.xml b/conf/autoload_configs/python.conf.xml
index 78a146143ae051319e2d4e1a1cb85f6510e22f83..d3a8fdc7558625a0a7ab456b644f56379324a479 100644 (file)
--- a/conf/autoload_configs/python.conf.xml
+++ b/conf/autoload_configs/python.conf.xml
@@ -4,13 +4,13 @@
     <!--<param name="xml-handler-bindings" value="dialplan"/>-->
 
     <!--
-       The following options identifies a py script that is launched
+       The following options identifies a py module that is launched
        at startup and may live forever in the background.
        You can define multiple lines, one for each script you 
        need to run.
     -->
-    <!--<param name="startup-script" value="startup_script_1.py"/>-->
-    <!--<param name="startup-script" value="startup_script_2.py"/>-->
+    <!--<param name="startup-script" value="startup_script_1"/>-->
+    <!--<param name="startup-script" value="startup_script_2"/>-->
 
   </settings>
 </configuration>

diff --git a/src/mod/languages/mod_python/mod_python.c b/src/mod/languages/mod_python/mod_python.c
index eedbd3c0dc79cfebb68ec10cd491bd682cc62376..782fe67ce1f8349fc812d1342a50309329df9511 100644 (file)
--- a/src/mod/languages/mod_python/mod_python.c
+++ b/src/mod/languages/mod_python/mod_python.c
@@ -388,6 +388,8 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_python_load)
 
        switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Python Framework Loading...\n");
 
+       globals.pool = pool;
+
        if (!Py_IsInitialized()) {
 
                // initialize python system
@@ -408,7 +410,6 @@ SWITCH_MODULE_LOAD_FUNCTION(mod_python_load)
                PyEval_ReleaseLock();
        }
 
-       globals.pool = pool;
        do_config();
 
        /* connect my internal structure to the blank pointer passed to me */