Webware for Python

Update of /cvsroot/webware/Webware/WebKit/Configs
In directory usw-pr-cvs1:/tmp/cvs-serv15326/WebKit/Configs

Modified Files:
	Application.config 
Log Message:
Adding setting ReportRPCExceptionsInWebKit that controls whether RPC servlet exceptions are reported on the server side.  Defaults to 1.

Index: Application.config
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Configs/Application.config,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** Application.config	23 Mar 2002 19:04:35 -0000	1.44
--- Application.config	12 Apr 2002 15:12:15 -0000	1.45
***************
*** 67,69 ****
--- 67,72 ----
  
  	'RPCExceptionReturn': 'traceback',  # occurred, exception, traceback
+ 	'ReportRPCExceptionsInWebKit': 1    # set to 0 if you don't want to have exceptions
+ 										# in RPC servlets be reported in the logs and/or
+ 										# by email.
  }

Update of /cvsroot/webware/Webware/WebKit
In directory usw-pr-cvs1:/tmp/cvs-serv15326/WebKit

Modified Files:
	Application.py PickleRPCServlet.py RPCServlet.py 
	XMLRPCServlet.py 
Log Message:
Adding setting ReportRPCExceptionsInWebKit that controls whether RPC servlet exceptions are reported on the server side.  Defaults to 1.

Index: Application.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Application.py,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** Application.py	14 Mar 2002 01:16:50 -0000	1.133
--- Application.py	12 Apr 2002 15:12:15 -0000	1.134
***************
*** 297,300 ****
--- 297,301 ----
  			                         },
  			'RPCExceptionReturn':    'traceback',
+ 			'ReportRPCExceptionsInWebKit':   1,
  			'Contexts':              { 'default':       'Examples',
  			                           'Admin':         'Admin',

Index: PickleRPCServlet.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/PickleRPCServlet.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PickleRPCServlet.py	21 Mar 2002 22:21:00 -0000	1.4
--- PickleRPCServlet.py	12 Apr 2002 15:12:15 -0000	1.5
***************
*** 102,111 ****
  			except RequestError, e:
  				response['requestError'] = str(e)
  			except Exception, e:
  				response['exception'] = self.resultForException(e, trans)
  			except:  # if it's a string exception, this gets triggered
  				response['exception'] = self.resultForException(sys.exc_info()[0], trans)
! 			response['timeResponded'] = time()
! 			response = dumps(response)
  		except:
  			# internal error, report as HTTP server error
--- 102,117 ----
  			except RequestError, e:
  				response['requestError'] = str(e)
+ 				self.sendResponse(trans, response)
+ 				self.handleException(trans)
  			except Exception, e:
  				response['exception'] = self.resultForException(e, trans)
+ 				self.sendResponse(trans, response)
+ 				self.handleException(trans)
  			except:  # if it's a string exception, this gets triggered
  				response['exception'] = self.resultForException(sys.exc_info()[0], trans)
! 				self.sendResponse(trans, response)
! 				self.handleException(trans)
! 			else:
! 				self.sendResponse(trans, response)
  		except:
  			# internal error, report as HTTP server error
***************
*** 113,116 ****
  			print ''.join(traceback.format_exception(*sys.exc_info()))
  			trans.response().setStatus(500, 'Server Error')
! 		else:
! 			self.sendOK('text/python/pickle/dict', response, trans)
--- 119,128 ----
  			print ''.join(traceback.format_exception(*sys.exc_info()))
  			trans.response().setStatus(500, 'Server Error')
! 			self.handleException(trans)
! 
! 	def sendResponse(self, trans, response):
! 		"""
! 		Timestamp the response dict and send it.
! 		"""
! 		response['timeResponded'] = time()
! 		self.sendOK('text/python/pickle/dict', dumps(response), trans)

Index: RPCServlet.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/RPCServlet.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RPCServlet.py	1 Feb 2002 08:54:06 -0000	1.1
--- RPCServlet.py	12 Apr 2002 15:12:15 -0000	1.2
***************
*** 48,49 ****
--- 48,63 ----
  		response.setHeader('Content-length', str(len(contents)))
  		response.write(contents)
+ 
+ 	def handleException(self, transaction):
+ 		"""
+ 		If ReportRPCExceptionsInWebKit is set to true, then
+ 		flush the response (because we don't want the standard HTML traceback
+ 		to be appended to the response) and then handle the exception in the
+ 		standard WebKit way.  This means logging it to the console, storing
+ 		it in the error log, sending error email, etc. depending on the
+ 		settings.
+ 		"""
+ 		setting = transaction.application().setting('ReportRPCExceptionsInWebKit')
+ 		if setting:
+ 			transaction.response().flush()
+ 			transaction.application().handleExceptionInTransaction(sys.exc_info(), transaction)

Index: XMLRPCServlet.py
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/XMLRPCServlet.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** XMLRPCServlet.py	21 Mar 2002 22:21:00 -0000	1.8
--- XMLRPCServlet.py	12 Apr 2002 15:12:15 -0000	1.9
***************
*** 35,38 ****
--- 35,41 ----
  			# generate response
  			try:
+ 				# This first test helps us to support PythonWin, which uses
+ 				# repeated calls to __methods__.__getitem__ to determine the
+ 				# allowed methods of an object.
  				if method == '__methods__.__getitem__':
  					response = self.exposedMethods()[params[0]]
***************
*** 44,52 ****
--- 47,60 ----
  				fault = self.resultForException(e, transaction)
  				response = xmlrpclib.dumps(xmlrpclib.Fault(1, fault))
+ 				self.sendOK('text/xml', response, transaction)
+ 				self.handleException(transaction)
  			except:  # if it's a string exception, this gets triggered
  				fault = self.resultForException(sys.exc_info()[0], transaction)
  				response = xmlrpclib.dumps(xmlrpclib.Fault(1, fault))
+ 				self.sendOK('text/xml', response, transaction)
+ 				self.handleException(transaction)
  			else:
  				response = xmlrpclib.dumps(response, methodresponse=1)
+ 				self.sendOK('text/xml', response, transaction)
  		except:
  			# internal error, report as HTTP server error
***************
*** 54,57 ****
  			print string.join(traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1],sys.exc_info()[2]))
  			transaction.response().setStatus(500, 'Server Error')
! 		else:
! 			self.sendOK('text/html', response, transaction)
--- 62,64 ----
  			print string.join(traceback.format_exception(sys.exc_info()[0],sys.exc_info()[1],sys.exc_info()[2]))
  			transaction.response().setStatus(500, 'Server Error')
! 			self.handleException(transaction)

Update of /cvsroot/webware/Webware/WebKit/Docs
In directory usw-pr-cvs1:/tmp/cvs-serv15326/WebKit/Docs

Modified Files:
	Application.configlist UsersGuide.html 
Added Files:
	RelNotes-0.8.html 
Log Message:
Adding setting ReportRPCExceptionsInWebKit that controls whether RPC servlet exceptions are reported on the server side.  Defaults to 1.

--- NEW FILE: RelNotes-0.8.html ---
<html>

<head>
	<link rel=stylesheet href=StyleSheet.css type=text/css>
	<style type=text/css>
	<!--
			li	{	padding-bottom: 0.75em;
				}
	-->
	</style>

	<title>WebKit 0.8 Release Notes</title>
</head>

<body>

<h1>WebKit 0.8 Release Notes</h1>
Version 0.8
<br>Webware for Python 0.8


<a name=Introduction><h2>Introduction</h2></a>
<ul>
	<li> Version 0.8 was released on @@/@@/2002.
</ul>


<h2>Major Changes</h2>

<ul>

	<li> *

</ul>


<h2>New Features</h2>

<ul>
	<li> *

</ul>

</ul>


<h2>Improvements and Refinements</h2>

<ul>

	<li> New setting 'ReportRPCExceptionsInWebKit': 1 means report exceptions in RPC servlets in the same way as exceptions in other servlets, i.e. in the logfiles, the error log, and/or by email.  0 means don't report the exceptions on the server side at all; this is useful if your RPC servlets are raising exceptions by design and you don't want to be notified.  Note that in release 0.7, there was no exception reporting on the server side in RPC servlets; if you want to get the same behavior in this release you'll have to set this setting to 0.
</ul>



<h2>Security</h2>

<ul>
	<li> *
</ul>



<h2>Minor API Changes</h2>

We don't track every change to the interface, but here are some notables:

<ul>
	<li> *
</ul>


<h2>Bugfixes</h2>

<ul>

	<li> *

</ul>


<p><hr>

</body>
</html>

Index: Application.configlist
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Docs/Application.configlist,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Application.configlist	23 Mar 2002 19:04:35 -0000	1.12
--- Application.configlist	12 Apr 2002 15:12:16 -0000	1.13
***************
*** 110,112 ****
--- 110,114 ----
  ('RPCExceptionReturn', "'traceback'", "Determines how much detail an RPC servlet will return when an exception occurs on the server side. Can take the values, in order of increasing detail, 'occurred', 'exception' and 'traceback'. The first reports the string 'unhandled exception', which the second prints the actual exception and finally the third prints both the exception and accompanying traceback. All returns are always strings."),
  
+ ('ReportRPCExceptionsInWebKit', '1', "1 means report exceptions in RPC servlets in the same way as exceptions in other servlets, i.e. in the logfiles, the error log, and/or by email.  0 means don't report the exceptions on the server side at all; this is useful if your RPC servlets are raising exceptions by design and you don't want to be notified."),
+ 
  ]

Index: UsersGuide.html
===================================================================
RCS file: /cvsroot/webware/Webware/WebKit/Docs/UsersGuide.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** UsersGuide.html	30 Mar 2002 14:37:24 -0000	1.22
--- UsersGuide.html	12 Apr 2002 15:12:16 -0000	1.23
***************
*** 523,526 ****
--- 523,533 ----
  </dl></p>
  
+ <p><dl class=config>
+ <dt class=config><span class=setting>ReportRPCExceptionsInWebKit</span>
+ &nbsp; <code> = 1</code></dt>
+ <dd class=config>
+ 1 means report exceptions in RPC servlets in the same way as exceptions in other servlets, i.e. in the logfiles, the error log, and/or by email.  0 means don't report the exceptions on the server side at all; this is useful if your RPC servlets are raising exceptions by design and you don't want to be notified.
+ </dd>
+ </dl></p>
  
  <a name=Administration><h2>Administration</h2></a>