thomasvs - in flumotion/trunk: . flumotion/component/consumers/httpstreamer

[flumotion-commit at lists.fluendo.com]

Author: thomasvs
Date: Mon Dec 10 23:12:15 2007
New Revision: 6003

Modified:
   flumotion/trunk/ChangeLog
   flumotion/trunk/flumotion/component/consumers/httpstreamer/resources.py
Log:
	* flumotion/component/consumers/httpstreamer/resources.py:
	  Log when we set the maximum fd # because of a python 2.4.3 bug.



Modified: flumotion/trunk/ChangeLog
==============================================================================
--- flumotion/trunk/ChangeLog	(original)
+++ flumotion/trunk/ChangeLog	Mon Dec 10 23:12:15 2007
@@ -1,3 +1,8 @@
+2007-12-10  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+	* flumotion/component/consumers/httpstreamer/resources.py:
+	  Log when we set the maximum fd # because of a python 2.4.3 bug.
+
 2007-12-10  Johan Dahlin  <johan at gnome.org>
 
 	* flumotion/admin/gtk/client.py (AdminClientWindow._close): Call

Modified: flumotion/trunk/flumotion/component/consumers/httpstreamer/resources.py
==============================================================================
--- flumotion/trunk/flumotion/component/consumers/httpstreamer/resources.py	(original)
+++ flumotion/trunk/flumotion/component/consumers/httpstreamer/resources.py	Mon Dec 10 23:12:15 2007
@@ -270,7 +270,10 @@
             neededfds = maxclients + self.__reserve_fds__
 
             # Bug in python 2.4.3, see http://sourceforge.net/tracker/index.php?func=detail&aid=1494314&group_id=5470&atid=105470
-            if version[:3] == (2,4,3) and not hasattr(socket,"has_2_4_3_patch"):
+            if version[:3] == (2, 4, 3) and \
+                not hasattr(socket, "has_2_4_3_patch"):
+                    self.warning(
+                        'Setting hardmax to 1024 due to python 2.4.3 bug')
                 hardmax = 1024
 
             if neededfds > softmax: