diff --git a/main.py b/main.py index a3085f9..5b9b1ec 100644 --- a/main.py +++ b/main.py @@ -1,7 +1,7 @@ import logging import tornado.web +import tornado.ioloop -from tornado.ioloop import IOLoop from tornado.options import parse_command_line, options from handler import IndexHandler, WsockHandler from settings import get_application_settings @@ -16,7 +16,7 @@ def main(): (r'/ws', WsockHandler) ] - loop = IOLoop.current() + loop = tornado.ioloop.IOLoop.current() app = tornado.web.Application(handlers, **settings) app._loop = loop app.listen(options.port, options.address) diff --git a/policy.py b/policy.py index eb40f18..591ff22 100644 --- a/policy.py +++ b/policy.py @@ -41,7 +41,7 @@ class AutoAddPolicy(paramiko.client.MissingHostKeyPolicy): """ lock = threading.Lock() - def is_missing_host_keys(self, client, hostname, key): + def is_missing_host_key(self, client, hostname, key): k = client._host_keys.lookup(hostname) if k is None: return True @@ -53,7 +53,7 @@ class AutoAddPolicy(paramiko.client.MissingHostKeyPolicy): def missing_host_key(self, client, hostname, key): with self.lock: - if self.is_missing_host_keys(client, hostname, key): + if self.is_missing_host_key(client, hostname, key): keytype = key.get_name() logging.info( 'Adding {} host key for {}'.format(keytype, hostname)