Commit 42038786 authored by ibuler's avatar ibuler

[Update] 添加开启socketio日志的开关

parent 8feb45a9
.git .git
logs/* logs/*
keys/* keys/*
data
...@@ -29,10 +29,14 @@ socket_io.on_error_default(lambda x: logger.exception(x)) ...@@ -29,10 +29,14 @@ socket_io.on_error_default(lambda x: logger.exception(x))
class HttpServer: class HttpServer:
@staticmethod @staticmethod
def run(): def run():
import time
host = config["BIND_HOST"] host = config["BIND_HOST"]
port = config["HTTPD_PORT"] port = config["HTTPD_PORT"]
print('Starting websocket server at {}:{}'.format(host, port)) print('Starting websocket server at {}:{}'.format(host, port))
socket_io.run(app, port=port, host=host, debug=False) while True:
socket_io.run(app, port=port, host=host, debug=False)
time.sleep(60)
print("Error occur, rerun websocket server")
@staticmethod @staticmethod
def shutdown(): def shutdown():
......
...@@ -142,6 +142,9 @@ class InteractiveServer: ...@@ -142,6 +142,9 @@ class InteractiveServer:
self.refresh_assets_nodes() self.refresh_assets_nodes()
elif opt in ['h', 'H']: elif opt in ['h', 'H']:
self.display_banner() self.display_banner()
elif opt == '#*32789':
from .logger import append_engineio_logger
append_engineio_logger()
else: else:
self.search_and_proxy_assets(opt) self.search_and_proxy_assets(opt)
......
...@@ -9,7 +9,7 @@ from logging.config import dictConfig ...@@ -9,7 +9,7 @@ from logging.config import dictConfig
from .conf import config as app_config from .conf import config as app_config
def create_logger(): def get_logger_config():
level = app_config['LOG_LEVEL'] level = app_config['LOG_LEVEL']
log_dir = app_config['LOG_DIR'] log_dir = app_config['LOG_DIR']
filename = 'coco-{}.log'.format(socket.gethostname()) filename = 'coco-{}.log'.format(socket.gethostname())
...@@ -21,6 +21,7 @@ def create_logger(): ...@@ -21,6 +21,7 @@ def create_logger():
'level': level, 'level': level,
'propagate': False, 'propagate': False,
} }
config = dict( config = dict(
version=1, version=1,
formatters={ formatters={
...@@ -48,7 +49,7 @@ def create_logger(): ...@@ -48,7 +49,7 @@ def create_logger():
'class': 'logging.handlers.RotatingFileHandler', 'class': 'logging.handlers.RotatingFileHandler',
'formatter': 'main', 'formatter': 'main',
'filename': log_path, 'filename': log_path,
'maxBytes': 1024*1024*100, 'maxBytes': 1024 * 1024 * 100,
'backupCount': 7, 'backupCount': 7,
}, },
}, },
...@@ -61,6 +62,26 @@ def create_logger(): ...@@ -61,6 +62,26 @@ def create_logger():
) )
if level.lower() == 'debug': if level.lower() == 'debug':
config['loggers']['paramiko'] = main_setting config['loggers']['paramiko'] = main_setting
# config['loggers']['socket.io'] = main_setting
# config['loggers']['engineio'] = main_setting
return config
def create_logger():
config = get_logger_config()
dictConfig(config)
logger = logging.getLogger()
return logger
def append_engineio_logger():
main_setting = {
'handlers': ['console', 'file'],
'level': 'DEBUG',
'propagate': False,
}
config = get_logger_config()
config['loggers']['engineio'] = main_setting
dictConfig(config) dictConfig(config)
logger = logging.getLogger() logger = logging.getLogger()
return logger return logger
......
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