websockify: KeyError in wsproxy.py

The following exception is caused by 204675c85d
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 <module>
>     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 <yamahata@valinux.co.jp>
This commit is contained in:
Isaku Yamahata 2012-09-20 15:03:25 +09:00
parent d5fe15096b
commit a038aff0f0
1 changed files with 3 additions and 3 deletions

View File

@ -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]