Commit 34de75cb authored by ibuler's avatar ibuler

[Update] 修改eventlet

parent 6e153a1a
# -*- coding: utf-8 -*-
#
import os
from flask_socketio import SocketIO
from flask import Flask
......@@ -17,8 +18,10 @@ socket_io = SocketIO()
socket_io.on_namespace(ProxyNamespace('/ssh'))
socket_io.on_namespace(ElfinderNamespace('/elfinder'))
# init_kwargs = {'async_mode': 'threading'}
init_kwargs = {'async_mode': 'eventlet'}
if os.environ.get('USE_EVENTLET', '1') == '1':
init_kwargs = {'async_mode': 'eventlet'}
else:
init_kwargs = {'async_mode': 'threading'}
socket_io.init_app(app, **init_kwargs),
socket_io.on_error_default(lambda x: logger.exception(x))
......
......@@ -304,8 +304,8 @@ class InteractiveServer:
)
def display_page_bottom_prompt(self):
msg = wr(_('Tips: Enter the asset ID and log directly into the asset.'))
self.client.send(msg, before=1)
msg = wr(_('Tips: Enter the asset ID and log directly into the asset.'), before=1)
self.client.send(msg)
prompt_page_up = _("Page up: P/p")
prompt_page_down = _("Page down: Enter|N/n")
prompt_back = _("BACK: b/q")
......
......@@ -92,7 +92,7 @@ class SSHServer:
t.daemon = True
t.start()
transport.close()
except paramiko.SSHException:
except (paramiko.SSHException, sock.timeout):
logger.warning("SSH negotiation failed")
except EOFError as e:
logger.warning("Handle EOF Error: {}".format(e))
......
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
import os
#import eventlet
#from eventlet.debug import hub_prevent_multiple_readers
#eventlet.monkey_patch()
#hub_prevent_multiple_readers(False)
if os.environ.get('USE_EVENTLET', '1') == '1':
import eventlet
from eventlet.debug import hub_prevent_multiple_readers
eventlet.monkey_patch()
hub_prevent_multiple_readers(False)
print("Use eventlet dispatch")
else:
print("Use local threading")
import os
import sys
import argparse
import time
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment