Merge branch 'dev' into test

app.py

@@ -21,14 +21,14 @@ from utils import update_video_w_h_rate
 from user2new import user2new
 from params_helper import Params
 # from werkzeug.middleware.profiler import ProfilerMiddleware
-from geventwebsocket.handler import WebSocketHandler
+# from geventwebsocket.handler import WebSocketHandler
 
 
-logging.basicConfig(level=logging.DEBUG,  # 控制台打印的日志级别
-                    filename=os.path.join(os.path.dirname(os.path.realpath(__file__)), "logs", 'app.log'),  # 将日志写入log_new.log文件中
-                    filemode='w',  # 模式，有w和a，w就是写模式，每次都会重新写日志，覆盖之前的日志 a是追加模式，默认如果不写的话，就是追加模式
-                    format="%(asctime)s:%(levelname)s:%(name)s -- %(message)s", datefmt="%Y/%m/%d %H:%M:%S"  # 日志格式
-                    )
+# logging.basicConfig(level=logging.DEBUG,  # 控制台打印的日志级别
+#                     filename=os.path.join(os.path.dirname(os.path.realpath(__file__)), "logs", 'app.log'),  # 将日志写入log_new.log文件中
+#                     filemode='w',  # 模式，有w和a，w就是写模式，每次都会重新写日志，覆盖之前的日志 a是追加模式，默认如果不写的话，就是追加模式
+#                     format="%(asctime)s:%(levelname)s:%(name)s -- %(message)s", datefmt="%Y/%m/%d %H:%M:%S"  # 日志格式
+#                     )
 
 app = Flask(__name__)
 
@@ -282,7 +282,8 @@ def apprun(MULTI_PROCESS=True, ip='0.0.0.0', port=5001):
     if MULTI_PROCESS == False:
         WSGIServer((ip, port), app).serve_forever()
     else:
-        mulserver = WSGIServer((ip, port), app, handler_class=WebSocketHandler)
+        # mulserver = WSGIServer((ip, port), app, handler_class=WebSocketHandler)
+        mulserver = WSGIServer((ip, port), app)
         mulserver.start()
  
         def server_forever():
@@ -290,7 +291,7 @@ def apprun(MULTI_PROCESS=True, ip='0.0.0.0', port=5001):
             mulserver._stop_event.wait()
  
         #for i in range(cpu_count()):
-        for i in range(16):
+        for i in range(24):
             p = Process(target=server_forever)
             p.start()