优化hub浏览器关闭逻辑

service/page_login.py

@@ -42,12 +42,11 @@ async def page_login(browser_id):
             if chromium.states.is_existed:
             if chromium.states.is_existed:
                 break
                 break
             else:
             else:
-                logger.error(f'非Hub浏览器-->重试启动浏览器:{open_count}')
                 tab.close()
                 tab.close()
-                await closeBrowser(browser_id)
-                time.sleep(3)
+                raise Exception(f'非Hub浏览器-->重试启动浏览器:{open_count}')
         except Exception as e:
         except Exception as e:
             logger.error(f"{browser_id}启动浏览器错误-->{e}")
             logger.error(f"{browser_id}启动浏览器错误-->{e}")
+            await closeBrowser(browser_id)
             time.sleep(3)
             time.sleep(3)
         if open_count == 0:
         if open_count == 0:
             raise AppError(f"{browser_id}-->启动浏览器失败")
             raise AppError(f"{browser_id}-->启动浏览器失败")

shop.py

@@ -144,8 +144,6 @@ async def handle_task(task):
                 logger.error(f"同步店铺任务超时: {task}")
                 logger.error(f"同步店铺任务超时: {task}")
             except Exception as e:
             except Exception as e:
                 logger.error(f"同步店铺任务异常: {e}")
                 logger.error(f"同步店铺任务异常: {e}")
-            finally:
-                await closeAllBrowser()
     elif type_ == 2:
     elif type_ == 2:
         # 上传图片和视频任务 - 使用线程池执行
         # 上传图片和视频任务 - 使用线程池执行
         with concurrent.futures.ThreadPoolExecutor(max_workers=INNER_MAX_WORKERS) as inner_executor:
         with concurrent.futures.ThreadPoolExecutor(max_workers=INNER_MAX_WORKERS) as inner_executor:
@@ -202,6 +200,9 @@ async def run():
                 future.result()
                 future.result()
             except Exception as e:
             except Exception as e:
                 logger.error(f"任务处理异常: {e}")
                 logger.error(f"任务处理异常: {e}")
+    for task in tasks:
+        if task.get("type") == 1:
+            await closeAllBrowser()
 
 
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':