From a038aff0f00b2f57e931570afc517adfae691366 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Thu, 20 Sep 2012 15:03:25 +0900 Subject: [PATCH] websockify: KeyError in wsproxy.py The following exception is caused by 204675c85d08733d66c2dddb58ac6d5dcfedc11f unbreak it by adding default value None. > # ./utils/nova-novncproxy --config-file /etc/nova/nova.conf --web . > Traceback (most recent call last): > File "./utils/nova-novncproxy", line 151, in > wrap_cmd=None) > File "./utils/nova-novncproxy", line 78, in __init__ > wsproxy.WebSocketProxy.__init__(self, *args, **kwargs) > File "/opt/stack/noVNC/utils/wsproxy.py", line 48, in __init__ > self.unix_target = kwargs.pop('unix_target') > KeyError: 'unix_target' Signed-off-by: Isaku Yamahata --- utils/websockify | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/websockify b/utils/websockify index 13f65826..61d586ec 100755 --- a/utils/websockify +++ b/utils/websockify @@ -45,9 +45,9 @@ Traffic Legend: 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.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]