review

longvideoapi/longvideoapi_config.py

@@ -11,6 +11,7 @@ server_group_id_list = ["sgp-h79h3lkvua1xs3418y"]
 alb_client_params = {
     'access_key_id': 'LTAI5tASD5yEZLeC8ffmNebY',
     'access_key_secret': '1PtsFRdp8viJmI78lEhNZR8MezWZBq',
+    'endpoint': 'alb-vpc.cn-hangzhou.aliyuncs.com',
     'region_id': 'cn-hangzhou'
 }
 # 购买机器权限

longvideoapi/longvideoapi_grayscale_update.py

@@ -123,6 +123,7 @@ def update_instance(ecs_client, alb_client, instance_id, version):
         sys.exit()
 
     # 3. 发送启动脚本到机器上
+    #todo  log
     utils.send_file_to_ecs(ecs_client=ecs_client, instance_id_list=[instance_id], **longvideoapi_config.start_sh)
     logging.info(f"send start shell file finished, instance: {instance_id}")
 
@@ -161,8 +162,12 @@ def update_instance(ecs_client, alb_client, instance_id, version):
 def main():
     try:
         version = sys.argv[1]
-        alb_client = utils.connect_alb_client(access_key_id=longvideoapi_config.alb_client_params['access_key_id'],
-                                              access_key_secret=longvideoapi_config.alb_client_params['access_key_secret'])
+        alb_client = utils.connect_alb_client(
+            access_key_id=longvideoapi_config.alb_client_params['access_key_id'],
+            access_key_secret=longvideoapi_config.alb_client_params['access_key_secret'],
+            endpoint=longvideoapi_config.alb_client_params['endpoint']
+        )
+
         ecs_client = utils.connect_client(access_key_id=longvideoapi_config.ecs_client_params['access_key_id'],
                                              access_key_secret=longvideoapi_config.ecs_client_params[
                                                  'access_key_secret'],

longvideoapi/longvideoapi_reduce_with_count.py

@@ -80,7 +80,8 @@ def main():
     try:
         alb_client = utils.connect_alb_client(
             access_key_id=longvideoapi_config.alb_client_params['access_key_id'],
-            access_key_secret=longvideoapi_config.alb_client_params['access_key_secret']
+            access_key_secret=longvideoapi_config.alb_client_params['access_key_secret'],
+            endpoint=longvideoapi_config.alb_client_params['endpoint']
         )
 
         ecs_client = utils.connect_client(

longvideoapi/longvideoapi_restart.py

@@ -9,12 +9,11 @@ logging.basicConfig(level=logging.INFO,
                     format='%(asctime)s %(filename)s[line:%(lineno)d] %(levelname)s %(message)s',
                     datefmt='%a, %d %b %Y %H:%M:%S')
 
-
-def server_restart(alb_client, instance_id, image_name):
+def server_restart(ecs_client, alb_client, instance_id, image_name):
     try:
         logging.info(f"Restarting instance: {instance_id}")
         # 获取ip
-        ip_address = utils.get_ip_address(alb_client=alb_client, instance_id=instance_id)
+        ip_address = utils.get_ip_address(ecs_client=ecs_client, instance_id=instance_id)
         logging.info(f"IP address: {instance_id}/{ip_address}")
 
         # 摘流量
@@ -31,7 +30,7 @@ def server_restart(alb_client, instance_id, image_name):
         logging.info("Docker restart finished.")
 
         # 探活
-        server_health_check(alb_client, instance_id)
+        server_health_check(ecs_client, instance_id)
         time.sleep(20)
         logging.info("Health check finished.")
 
@@ -49,9 +48,14 @@ def server_restart(alb_client, instance_id, image_name):
 
 def main():
     try:
+        ecs_client = utils.connect_client(access_key_id=longvideoapi_config.ecs_client_params['access_key_id'],
+                                          access_key_secret=longvideoapi_config.ecs_client_params['access_key_secret'],
+                                          region_id=longvideoapi_config.ecs_client_params['region_id'])
+
         alb_client = utils.connect_alb_client(
             access_key_id=longvideoapi_config.alb_client_params['access_key_id'],
-            access_key_secret=longvideoapi_config.alb_client_params['access_key_secret']
+            access_key_secret=longvideoapi_config.alb_client_params['access_key_secret'],
+            endpoint=longvideoapi_config.alb_client_params['endpoint']
         )
 
         # 获取 ALB 下所有机器
@@ -64,7 +68,7 @@ def main():
         # 逐台重启
         image_name = 'longvideoapi'
         for i, instance_id in enumerate(online_instance_ids):
-            server_restart(alb_client=alb_client, instance_id=instance_id, image_name=image_name)
+            server_restart(ecs_client=ecs_client, alb_client=alb_client, instance_id=instance_id, image_name=image_name)
             logging.info(f"Restart progress: {i + 1}/{online_instance_count}")
         logging.info("All servers restarted successfully!")
     except Exception as e:

longvideoapi/longvideoapi_scaling_k_count.py

@@ -103,6 +103,8 @@ async def ess_instance(ecs_client, alb_client, ess_count, max_workers):
                      f"health count: {len(health_instances)}")
         sys.exit()
 
+
+
 def main():
     try:
         ecs_client = utils.connect_client(access_key_id=longvideoapi_config.ecs_client_params['access_key_id'],
@@ -110,7 +112,8 @@ def main():
                                              region_id=longvideoapi_config.ecs_client_params['region_id'])
         alb_client = utils.connect_alb_client(
             access_key_id=longvideoapi_config.alb_client_params['access_key_id'],
-            access_key_secret=longvideoapi_config.alb_client_params['access_key_secret']
+            access_key_secret=longvideoapi_config.alb_client_params['access_key_secret'],
+            endpoint=longvideoapi_config.alb_client_params['endpoint']
         )
         # 获取批量创建ECS实例的数量
         ess_instance_count = int(sys.argv[1])

longvideoapi/longvideoapi_update_k.py

@@ -292,13 +292,14 @@ def remove_instances(ecs_client, alb_client, instance_ids):
         sys.exit()
 
 
-
 def main():
     try:
         version = sys.argv[1]
-        alb_client = utils.connect_client(access_key_id=longvideoapi_config.alb_client_params['access_key_id'],
-                                          access_key_secret=longvideoapi_config.alb_client_params['access_key_secret'],
-                                          region_id=longvideoapi_config.alb_client_params['region_id'])
+        alb_client = utils.connect_alb_client(
+            access_key_id=longvideoapi_config.alb_client_params['access_key_id'],
+            access_key_secret=longvideoapi_config.alb_client_params['access_key_secret'],
+            endpoint=longvideoapi_config.alb_client_params['endpoint']
+        )
         ecs_client = utils.connect_client(access_key_id=longvideoapi_config.ecs_client_params['access_key_id'],
                                              access_key_secret=longvideoapi_config.ecs_client_params['access_key_secret'],
                                              region_id=longvideoapi_config.ecs_client_params['region_id'])