[Freeswitch-trunk] [commit] r12658 - in freeswitch/trunk: conf/autoload_configs src/mod/languages/mod_python

[FreeSWITCH SVN]

Author: brian
Date: Wed Mar 18 13:56:36 2009
New Revision: 12658

Log:
MODLANG-105

Modified:
   freeswitch/trunk/conf/autoload_configs/python.conf.xml
   freeswitch/trunk/src/mod/languages/mod_python/mod_python.c

Modified: freeswitch/trunk/conf/autoload_configs/python.conf.xml
==============================================================================
--- freeswitch/trunk/conf/autoload_configs/python.conf.xml	(original)
+++ freeswitch/trunk/conf/autoload_configs/python.conf.xml	Wed Mar 18 13:56:36 2009
@@ -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>

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	Wed Mar 18 13:56:36 2009
@@ -388,6 +388,8 @@
 
 	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 @@
 		PyEval_ReleaseLock();
 	}
 
-	globals.pool = pool;
 	do_config();
 
 	/* connect my internal structure to the blank pointer passed to me */