Webware for Python

Author: chrisz
Date: Sat Mar 24 04:43:57 2007
New Revision: 6351

Modified:
   Webware/trunk/WebKit/ASStreamOut.py
   Webware/trunk/WebKit/ThreadedAppServer.py

Log:
Added setting ResponseBufferSize for changing the buffer size of the output stream.

Modified: Webware/trunk/WebKit/ASStreamOut.py
==============================================================================
--- Webware/trunk/WebKit/ASStreamOut.py	(original)
+++ Webware/trunk/WebKit/ASStreamOut.py	Sat Mar 24 04:43:57 2007
@@ -37,9 +37,9 @@
 
 	"""
 
-	def __init__(self):
-		self._autoCommit = False
-		self._bufferSize = 8192
+	def __init__(self, autoCommit=False, bufferSize=8192):
+		self._autoCommit = autoCommit
+		self._bufferSize = bufferSize
 		self._committed = False
 		self._needCommit = False
 		self._chunks = []
@@ -158,7 +158,6 @@
 		"""Are we committed?"""
 		return self._committed
 
-
 	def needCommit(self):
 		"""Request for commitment.
 

Modified: Webware/trunk/WebKit/ThreadedAppServer.py
==============================================================================
--- Webware/trunk/WebKit/ThreadedAppServer.py	(original)
+++ Webware/trunk/WebKit/ThreadedAppServer.py	Sat Mar 24 04:43:57 2007
@@ -28,7 +28,6 @@
 import AppServer as AppServerModule
 from AutoReloadingAppServer import AutoReloadingAppServer as AppServer
 from ASStreamOut import ASStreamOut, ConnectionAbortedError
-
 from MiscUtils.Funcs import timestamp
 from WebUtils import Funcs
 
@@ -48,6 +47,7 @@
 	# @@ the following settings are not yet officially documented
 	'RequestQueueSize': 0, # means twice the maximum number of threads
 	'RequestBufferSize': 8*1024, # 8 kBytes
+	'ResponseBufferSize': 8*1024, # 8 kBytes
 	# @@ the following setting is not yet implemented
 	# 'SocketType': 'inet', # inet, inet6, unix
 }
@@ -107,6 +107,7 @@
 			# otherwise do not make it smaller than the max number of threads
 			self._requestQueueSize = self._maxServerThreads
 		self._requestBufferSize = self.setting('RequestBufferSize')
+		self._responseBufferSize = self.setting('ResponseBufferSize')
 
 		self._threadPool = []
 		self._threadCount = 0
@@ -733,14 +734,14 @@
 
 	"""
 
-	def __init__(self, sock):
+	def __init__(self, sock, autoCommit=False, bufferSize=8192):
 		"""Create stream.
 
 		We get an extra `sock` argument, which is the socket which we'll
 		stream output to (if we're streaming).
 
 		"""
-		ASStreamOut.__init__(self)
+		ASStreamOut.__init__(self, autoCommit, bufferSize)
 		self._socket = sock
 
 	def flush(self):
@@ -811,7 +812,7 @@
 		requestDict['input'] = self.makeInput()
 		requestDict['requestID'] = self._requestID
 
-		streamOut = TASStreamOut(self._sock)
+		streamOut = TASStreamOut(self._sock, bufferSize=self._responseBufferSize)
 		transaction = self._server._app.dispatchRawRequest(requestDict, streamOut)
 		try:
 			streamOut.close()