Bläddra i källkod

启动负载均衡

chanjunkai 5 år sedan
förälder
incheckning
73360771ae
3 ändrade filer med 13 tillägg och 14 borttagningar
  1. 1 1
      azoauth/config.py
  2. 1 1
      controller/distribution.py
  3. 11 12
      controller/index.py

+ 1 - 1
azoauth/config.py

@@ -17,7 +17,7 @@ RESP_SERVER_DOMAIN_DATA = {
     # 'en': 'www.zositech.org'
     'EN': 'rtsp.zositech.org',
     #'HK': '119.8.33.56'
-    'EN1':'18.222.107.129'
+    'EN1':'3.16.66.144'
 }
 SERVER_PREFIX = 'http://www.dvema.com'
 #Easydarwin

+ 1 - 1
controller/distribution.py

@@ -16,7 +16,7 @@ from object.tkObject import tkObject
 from service.CommonService import CommonService
 from object.RedisObject import RedisObject
 
-rtspServer = "rtsp.zositech.org,18.222.107.129"
+rtspServer = "rtsp.zositech.org,3.16.66.144"
 
 class selectConnectNum(TemplateView):
     def post(self, request, *args, **kwargs):

+ 11 - 12
controller/index.py

@@ -228,18 +228,17 @@ class oa2RtspStartView(TemplateView):
             # RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA['CN']
             RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA['EN']
             #如果是美国,则进行负载均衡
-            # if RESP_SERVER_DOMAIN == RESP_SERVER_DOMAIN_DATA['EN']:
-            #     redisObj1 = RedisObject(db=1)
-            #     key1 = 'rtsp.zositech.org'
-            #     key2 = '18.222.107.129'
-            #     redis_data1 = redisObj1.get_data(key1)
-            #     redis_data2 = redisObj1.get_data(key2)
-            #     mm=min(redis_data1,redis_data2)
-            #     if redis_data1 == mm and redis_data1 != -1:
-            #         RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA['EN']
-            #     elif redis_data2 == mm and redis_data2 != -1:
-            #         RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA['EN1']
-            #E
+            if RESP_SERVER_DOMAIN == RESP_SERVER_DOMAIN_DATA['EN']:
+                redisObj1 = RedisObject(db=1)
+                key1 = 'rtsp.zositech.org'
+                key2 = '18.222.107.129'
+                redis_data1 = redisObj1.get_data(key1)
+                redis_data2 = redisObj1.get_data(key2)
+                mm=min(redis_data1,redis_data2)
+                if redis_data1 == mm and redis_data1 != -1:
+                    RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA['EN']
+                elif redis_data2 == mm and redis_data2 != -1:
+                    RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA['EN1']
             MSG = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:{PORT_PREFIX}/{stream_name}'. \
                 format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN,
                        stream_name=stream_name,