Changeset 51661 in webkit

Timestamp:

Dec 3, 2009 2:01:14 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-12-03 Yuzo Fujishima <​yuzo@google.com>

Reviewed by Eric Seidel.

Update pywebsocket to 0.4.3
This version logs friendlier and higher-level messages in WARN level, which is used for LayoutTests.
Stack trace is logged now in INFO level.
​https://bugs.webkit.org/show_bug.cgi?id=32097

• pywebsocket/mod_pywebsocket/dispatch.py:
• pywebsocket/mod_pywebsocket/msgutil.py:
• pywebsocket/mod_pywebsocket/standalone.py:
• pywebsocket/mod_pywebsocket/util.py:
• pywebsocket/setup.py:
• pywebsocket/test/test_dispatch.py:
• pywebsocket/test/test_util.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• pywebsocket/mod_pywebsocket/dispatch.py (modified) (2 diffs)
• pywebsocket/mod_pywebsocket/msgutil.py (modified) (6 diffs)
• pywebsocket/mod_pywebsocket/standalone.py (modified) (2 diffs)
• pywebsocket/mod_pywebsocket/util.py (modified) (1 diff)
• pywebsocket/setup.py (modified) (1 diff)
• pywebsocket/test/test_dispatch.py (modified) (2 diffs)
• pywebsocket/test/test_util.py (modified) (1 diff)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2009-12-03  Yuzo Fujishima  <yuzo@google.com>
+
+        Reviewed by Eric Seidel.
+
+        Update pywebsocket to 0.4.3
+        This version logs friendlier and higher-level messages in WARN level, which is used for LayoutTests.
+        Stack trace is logged now in INFO level.
+        https://bugs.webkit.org/show_bug.cgi?id=32097
+
+        * pywebsocket/mod_pywebsocket/dispatch.py:
+        * pywebsocket/mod_pywebsocket/msgutil.py:
+        * pywebsocket/mod_pywebsocket/standalone.py:
+        * pywebsocket/mod_pywebsocket/util.py:
+        * pywebsocket/setup.py:
+        * pywebsocket/test/test_dispatch.py:
+        * pywebsocket/test/test_util.py:
+
 2009-12-03  Sam Weinig  <sam@webkit.org>
 

trunk/WebKitTools/pywebsocket/mod_pywebsocket/dispatch.py

@@ -161 +161 @@
         try:
             do_extra_handshake_(request)
-        except Exception:
-            raise DispatchError('%s raised exception: %s' %
-                    (_DO_EXTRA_HANDSHAKE_HANDLER_NAME, util.get_stack_trace()))
+        except Exception, e:
+            util.prepend_message_to_exception(
+                    '%s raised exception for %s: ' % (
+                            _DO_EXTRA_HANDSHAKE_HANDLER_NAME,
+                            request.ws_resource),
+                    e)
+            raise
 
     def transfer_data(self, request):
@@ -178 +182 @@
         try:
             transfer_data_(request)
-        except Exception:
-            raise DispatchError('%s raised exception: %s' %
-                    (_TRANSFER_DATA_HANDLER_NAME, util.get_stack_trace()))
+        except Exception, e:
+            util.prepend_message_to_exception(
+                    '%s raised exception for %s: ' % (
+                            _TRANSFER_DATA_HANDLER_NAME, request.ws_resource),
+                    e)
+            raise
 
     def _handler(self, request):

trunk/WebKitTools/pywebsocket/mod_pywebsocket/msgutil.py

@@ -40 +40 @@
 import Queue
 import threading
+import util
+
+
+class MsgUtilException(Exception):
+    pass
+
+
+def _read(request, length):
+    bytes = request.connection.read(length)
+    if not bytes:
+        raise MsgUtilException(
+                'Failed to receive message from %r' %
+                        (request.connection.remote_addr,))
+    return bytes
+
+
+def _write(request, bytes):
+    try:
+        request.connection.write(bytes)
+    except Exception, e:
+        util.prepend_message_to_exception(
+                'Failed to send message to %r: ' %
+                        (request.connection.remote_addr,),
+                e)
+        raise
 
 
@@ -50 +75 @@
     """
 
-    request.connection.write('\x00' + message.encode('utf-8') + '\xff')
+    _write(request, '\x00' + message.encode('utf-8') + '\xff')
 
 
@@ -64 +89 @@
         # mp_conn.read will block if no bytes are available.
         # Timeout is controlled by TimeOut directive of Apache.
-        frame_type_str = request.connection.read(1)
+        frame_type_str = _read(request, 1)
         frame_type = ord(frame_type_str[0])
         if (frame_type & 0x80) == 0x80:
@@ -85 +110 @@
     length = 0
     while True:
-        b_str = request.connection.read(1)
+        b_str = _read(request, 1)
         b = ord(b_str[0])
         length = length * 128 + (b & 0x7f)
@@ -96 +121 @@
     bytes = []
     while length > 0:
-        new_bytes = request.connection.read(length)
+        new_bytes = _read(request, length)
         bytes.append(new_bytes)
         length -= len(new_bytes)
@@ -105 +130 @@
     bytes = []
     while True:
-        ch = request.connection.read(1)
+        ch = _read(request, 1)
         if ch == delim_char:
             break

trunk/WebKitTools/pywebsocket/mod_pywebsocket/standalone.py

@@ -114 +114 @@
     local_addr = property(get_local_addr)
 
+    def get_remote_addr(self):
+        """Getter to mimic mp_conn.remote_addr.
+
+        Setting the property in __init__ won't work because the request
+        handler is not initialized yet there."""
+        return self._request_handler.client_address
+    remote_addr = property(get_remote_addr)
+
     def write(self, data):
         """Mimic mp_conn.write()."""
@@ -227 +235 @@
             except dispatch.DispatchError, e:
                 logging.warning('mod_pywebsocket: %s' % e)
+                return False
+            except Exception, e:
+                logging.warning('mod_pywebsocket: %s' % e)
+                logging.info('mod_pywebsocket: %s' % util.get_stack_trace())
                 return False
         return result

trunk/WebKitTools/pywebsocket/mod_pywebsocket/util.py

@@ -50 +50 @@
 
 
+def prepend_message_to_exception(message, exc):
+    """Prepend message to the exception."""
+
+    exc.args = (message + str(exc),)
+    return
+
+
 # vi:sts=4 sw=4 et

trunk/WebKitTools/pywebsocket/setup.py

@@ -57 +57 @@
       packages=[_PACKAGE_NAME],
       url='http://code.google.com/p/pywebsocket/',
-      version='0.4.2.1',
+      version='0.4.3',
       )
 

trunk/WebKitTools/pywebsocket/test/test_dispatch.py

@@ -137 +137 @@
 
         request.ws_origin = 'http://bad.example.com'
-        self.assertRaises(dispatch.DispatchError,
-                          dispatcher.do_extra_handshake, request)
+        self.assertRaises(Exception, dispatcher.do_extra_handshake, request)
 
     def test_transfer_data(self):
@@ -194 +193 @@
             dispatcher.transfer_data(request)
             self.fail()
-        except dispatch.DispatchError, e:
+        except Exception, e:
             self.failUnless(str(e).find('Intentional') != -1)
-        except Exception:
-            self.fail()
 
     def test_scan_dir(self):

trunk/WebKitTools/pywebsocket/test/test_util.py

@@ -50 +50 @@
             self.failUnless(trace.find('ZeroDivisionError') != -1)
 
+    def test_prepend_message_to_exception(self):
+        exc = Exception('World')
+        self.assertEqual('World', str(exc))
+        util.prepend_message_to_exception('Hello ', exc)
+        self.assertEqual('Hello World', str(exc))
+
 
 if __name__ == '__main__':