|
|
@@ -130,17 +130,15 @@ async def func_expand(kw: str = Form(...),kw2:Optional[str] = Form(None),kw3:Opt
|
|
|
|
|
|
|
|
|
def restart_browser():
|
|
|
-<<<<<<< HEAD
|
|
|
- portnum=random.randint(4444,4555)
|
|
|
- print(portnum)
|
|
|
- os.system('docker container stop sel2')
|
|
|
- time.sleep(1)
|
|
|
- os.system('docker container rm sel2')
|
|
|
- time.sleep(1)
|
|
|
- os.system('docker run -d -p'+str(portnum)+':4444 --name sel2 --add-host=host.docker.internal:host-gateway --shm-size="2g" selenium/standalone-chrome:103.0')
|
|
|
- time.sleep(18)
|
|
|
global driver
|
|
|
-
|
|
|
+ while True:
|
|
|
+ try:
|
|
|
+ os.system('docker container restart tiny1')
|
|
|
+ time.sleep(1)
|
|
|
+ break
|
|
|
+ except:
|
|
|
+ os.system('docker container restart tiny1')
|
|
|
+ time.sleep(10)
|
|
|
if driver is not None:
|
|
|
print('closing')
|
|
|
driver.quit()
|
|
|
@@ -150,25 +148,17 @@ def restart_browser():
|
|
|
options.add_argument("--no-sandbox")
|
|
|
#options.add_argument("--disable-dev-shm-usage")
|
|
|
options.add_argument('--headless')
|
|
|
+ options.add_experimental_option("debuggerAddress", "127.0.0.1:9923")
|
|
|
options.add_argument("--incognito")
|
|
|
try:
|
|
|
- #driver = webdriver.Chrome(options=options,executable_path='/root/driver/chromedriver103')
|
|
|
- driver = webdriver.Remote(command_executor='http://127.0.0.1:'+str(portnum)+'/wd/hub',options=options)
|
|
|
+ driver = webdriver.Chrome(options=options,executable_path='/root/driver/chromedriver')
|
|
|
+ #driver = webdriver.Remote(command_executor='http://127.0.0.1:'+str(portnum)+'/wd/hub',options=options)
|
|
|
except:
|
|
|
return None
|
|
|
except:
|
|
|
print('開啟失敗')
|
|
|
driver=None
|
|
|
return None
|
|
|
-=======
|
|
|
- global driver
|
|
|
- options = webdriver.ChromeOptions()
|
|
|
- options.add_argument("--no-sandbox")
|
|
|
- options.add_argument("--disable-dev-shm-usage")
|
|
|
- options.add_argument('--headless')
|
|
|
- s = Service('/root/driver/chromedriver')
|
|
|
- driver = webdriver.Remote(service=s,options=options)
|
|
|
->>>>>>> c09f7edb8a059f95d41e06a51587bbb223d93ff3
|
|
|
return driver
|
|
|
|
|
|
@app.post("/ranking/")
|
