]> git.proxmox.com Git - mirror_novnc.git/commitdiff
Update websockify
authorJoel Martin <github@martintribe.org>
Fri, 21 Sep 2012 12:09:45 +0000 (07:09 -0500)
committerJoel Martin <github@martintribe.org>
Fri, 21 Sep 2012 12:09:45 +0000 (07:09 -0500)
Update to websockify febaeee85c

Gracefully handle errors when popping kwargs:
https://github.com/kanaka/websockify/pull/53

utils/websockify

index 13f65826ece42923cbf08a475f1df899ff930917..c792dbf1fa31357ae658a11fdf231d1cd9bdedc3 100755 (executable)
@@ -41,13 +41,13 @@ Traffic Legend:
 
     def __init__(self, *args, **kwargs):
         # Save off proxy specific options
-        self.target_host    = kwargs.pop('target_host')
-        self.target_port    = kwargs.pop('target_port')
-        self.wrap_cmd       = kwargs.pop('wrap_cmd')
-        self.wrap_mode      = kwargs.pop('wrap_mode')
-        self.unix_target    = kwargs.pop('unix_target')
-        self.ssl_target     = kwargs.pop('ssl_target')
-        self.target_cfg     = kwargs.pop('target_cfg')
+        self.target_host    = kwargs.pop('target_host', None)
+        self.target_port    = kwargs.pop('target_port', None)
+        self.wrap_cmd       = kwargs.pop('wrap_cmd', None)
+        self.wrap_mode      = kwargs.pop('wrap_mode', None)
+        self.unix_target    = kwargs.pop('unix_target', None)
+        self.ssl_target     = kwargs.pop('ssl_target', None)
+        self.target_cfg     = kwargs.pop('target_cfg', None)
         # Last 3 timestamps command was run
         self.wrap_times    = [0, 0, 0]