Преглед изворни кода

修改docker 接口请求慢

余尚辉 пре 4 месеци
родитељ
комит
bcf624c74d

+ 1 - 1
docker-compose.yml

@@ -1,6 +1,6 @@
 services:
   pjsua:
-    image: pjsua2:v2.14.1107
+    image: pjsua2:v2.14.1106
     container_name: pjsua
     restart: always
     network_mode: host

+ 4 - 1
src/core/callcenter/esl/client.py

@@ -396,7 +396,10 @@ class OutboundClient:
 
     def __init__(self, agent, logger):
         self.logger = logger
-        threading.Thread(target=self.start, args=('0.0.0.0', 8084, agent, logger)).start()
+        # threading.Thread(target=self.start, args=('0.0.0.0', 8084, agent, logger)).start()
+        server_thread = threading.Thread(target=self.start, args=('0.0.0.0', 8084, agent, logger))
+        server_thread.daemon = True  # 设置守护线程
+        server_thread.start()
 
     class ESLRequestHandler(socketserver.BaseRequestHandler):
         def setup(self):

+ 8 - 5
src/core/callcenter/ws.py

@@ -22,11 +22,14 @@ class MyNamespace(Namespace):
         print('Client connected, ', request.sid)
 
     def on_login(self, msg):
-        print('login.Received message: {}, {}', str(msg), request.sid)
-        user_id = msg.get('userId')
-        session['user_id'] = user_id
-        join_room(user_id)
-        emit('login', request.sid)
+        try:
+            print('login.Received message: {}, {}', str(msg), request.sid)
+            user_id = msg.get('userId')
+            session['user_id'] = user_id
+            join_room(user_id)
+            emit('login', request.sid)
+        except Exception as e:
+            print('login.err message: {}', e)
 
     def on_heartbeat(self, heartbeat):
         pass

+ 3 - 3
src/core/datasource.py

@@ -19,9 +19,9 @@ SERVE_HOST = os.environ.get("SERVE_HOST")
 MYSQL_PASSWORD = 'EKoAe3H8xybQKrFPApXM'
 
 if SERVE_HOST != "192.168.100.159":
-    # SIP_SERVER = SERVE_HOST
-    # MYSQL_PASSWORD = "12345678"
-    SIP_SERVER = "pbx.fuxicarbon.com"
+    SIP_SERVER = SERVE_HOST
+    MYSQL_PASSWORD = "12345678"
+    # SIP_SERVER = "pbx.fuxicarbon.com"
 else:
     SIP_SERVER = "pbx.fuxicarbon.com"
 

+ 2 - 1
src/core/server.py

@@ -3,8 +3,9 @@
 
 from src.core.callcenter.views import app
 from src.core.callcenter.ws import socketio
-
+import multiprocessing as mp
 
 if __name__ == '__main__':
+    mp.set_start_method('spawn', force=True)
     socketio.run(app, host='0.0.0.0', port=8000, allow_unsafe_werkzeug=True, debug=True)
     # app.run(host='0.0.0.0', port=8000, debug=True)

+ 5 - 5
src/core/voip/bot.py

@@ -440,7 +440,7 @@ class ToTextBotAgent:
 
 class BotAgent:
 
-    def __init__(self, logger, user_part_range=range(1001, 1019), host=SIP_SERVER, port="5060", password="slibra@#123456"):
+    def __init__(self, logger, user_part_range=range(1001, 1011), host=SIP_SERVER, port="5060", password="slibra@#123456"):
         self.logger = logger
         self.user_part_range, self.host, self.port, self.password = user_part_range, host, port, password
         self.user_part_pool = queue.Queue(maxsize=len(user_part_range))
@@ -448,15 +448,15 @@ class BotAgent:
         self.calls = {}
         self.ep = pj.Endpoint()
         self.is_stopping = False
-        threading.Thread(target=self.create_pjsua2, args=()).start()
+        threading.Thread(target=self.create_pjsua2, daemon=True).start()
 
     def create_pjsua2(self):
         # Create and initialize the library
         ep_cfg = pj.EpConfig()
-        ep_cfg.uaConfig.threadCnt = 32
+        ep_cfg.uaConfig.threadCnt = 12
         ep_cfg.uaConfig.mainThreadOnly = False
-        ep_cfg.uaConfig.maxCalls = 20
-        ep_cfg.uaConfig.maxAccounts = 20
+        ep_cfg.uaConfig.maxCalls = 12
+        ep_cfg.uaConfig.maxAccounts = 12
         ep_cfg.medConfig.noVad = True
         ep_cfg.logConfig.level = 4
         ep_cfg.logConfig.consoleLevel = 4