From: Brian West <brian@freeswitch.org>
Date: Wed, 18 Mar 2009 18:56:36 +0000 (+0000)
Subject: MODLANG-105
X-Git-Tag: v1.0.4~1482
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e941f7f4a4eb48034502bea1db2d3ad74bf8ae78;p=thirdparty%2Ffreeswitch.git

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 78a146143a..d3a8fdc755 100644
--- 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 eedbd3c0dc..782fe67ce1 100644
--- 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 */