Update server2.py
Browse files- server2.py +7 -9
server2.py
CHANGED
|
@@ -290,7 +290,7 @@ def check_api1():
|
|
| 290 |
n=0
|
| 291 |
while True:
|
| 292 |
n = n + 1
|
| 293 |
-
if not os.path.exists('/sillytavern2-data.zip'):
|
| 294 |
print("/sillytavern 文件不存在,结束检测")
|
| 295 |
break
|
| 296 |
try:
|
|
@@ -303,10 +303,10 @@ def check_api1():
|
|
| 303 |
break # 接口正常,退出循环
|
| 304 |
|
| 305 |
# 如果不是 403,打印其他信息
|
| 306 |
-
print("SillyTavern未启动,状态码:", response.status_code)
|
| 307 |
|
| 308 |
except requests.exceptions.RequestException as e:
|
| 309 |
-
print(f"SillyTavern未启动3: {e}") # 打印具体错误信息
|
| 310 |
|
| 311 |
time.sleep(5) # 等待5秒后重试
|
| 312 |
|
|
@@ -316,7 +316,7 @@ def check_api1():
|
|
| 316 |
n = 0
|
| 317 |
while True:
|
| 318 |
n = n + 1
|
| 319 |
-
if not os.path.exists('/sillytavern2-data.zip')
|
| 320 |
print("/sillytavern 文件不存在,结束检测")
|
| 321 |
break
|
| 322 |
if Service_status:
|
|
@@ -341,17 +341,17 @@ def check_api1():
|
|
| 341 |
else:
|
| 342 |
print("接口返回信息:", response_json)
|
| 343 |
except requests.exceptions.ConnectionError as e:
|
| 344 |
-
print(f"接口异常1: {e}")
|
| 345 |
# threading.Thread(target=Frpc, daemon=True).start()
|
| 346 |
break
|
| 347 |
|
| 348 |
except requests.exceptions.Timeout as e:
|
| 349 |
-
print(f"接口异常2: {e}")
|
| 350 |
# threading.Thread(target=Frpc, daemon=True).start()
|
| 351 |
break
|
| 352 |
|
| 353 |
except requests.exceptions.RequestException as e:
|
| 354 |
-
print(f"接口异常3: {e}")
|
| 355 |
# threading.Thread(target=Frpc, daemon=True).start()
|
| 356 |
break
|
| 357 |
|
|
@@ -504,8 +504,6 @@ def SillyTavern():
|
|
| 504 |
# ]
|
| 505 |
# run_commands(commands)
|
| 506 |
threading.Thread(target=SillyTavern, daemon=True).start()
|
| 507 |
-
|
| 508 |
-
time.sleep(60)
|
| 509 |
check_api1()
|
| 510 |
|
| 511 |
if os.path.exists('/sillytavern/start.sh'):
|
|
|
|
| 290 |
n=0
|
| 291 |
while True:
|
| 292 |
n = n + 1
|
| 293 |
+
if not os.path.exists('/sillytavern2-data.zip') and n > 50:
|
| 294 |
print("/sillytavern 文件不存在,结束检测")
|
| 295 |
break
|
| 296 |
try:
|
|
|
|
| 303 |
break # 接口正常,退出循环
|
| 304 |
|
| 305 |
# 如果不是 403,打印其他信息
|
| 306 |
+
print("SillyTavern未启动,状态码:", response.status_code,n)
|
| 307 |
|
| 308 |
except requests.exceptions.RequestException as e:
|
| 309 |
+
print(f"SillyTavern未启动3: {e}",n) # 打印具体错误信息
|
| 310 |
|
| 311 |
time.sleep(5) # 等待5秒后重试
|
| 312 |
|
|
|
|
| 316 |
n = 0
|
| 317 |
while True:
|
| 318 |
n = n + 1
|
| 319 |
+
if not os.path.exists('/sillytavern2-data.zip') and n > 50:#
|
| 320 |
print("/sillytavern 文件不存在,结束检测")
|
| 321 |
break
|
| 322 |
if Service_status:
|
|
|
|
| 341 |
else:
|
| 342 |
print("接口返回信息:", response_json)
|
| 343 |
except requests.exceptions.ConnectionError as e:
|
| 344 |
+
print(f"接口异常1: {e}",n)
|
| 345 |
# threading.Thread(target=Frpc, daemon=True).start()
|
| 346 |
break
|
| 347 |
|
| 348 |
except requests.exceptions.Timeout as e:
|
| 349 |
+
print(f"接口异常2: {e}",n)
|
| 350 |
# threading.Thread(target=Frpc, daemon=True).start()
|
| 351 |
break
|
| 352 |
|
| 353 |
except requests.exceptions.RequestException as e:
|
| 354 |
+
print(f"接口异常3: {e}",n)
|
| 355 |
# threading.Thread(target=Frpc, daemon=True).start()
|
| 356 |
break
|
| 357 |
|
|
|
|
| 504 |
# ]
|
| 505 |
# run_commands(commands)
|
| 506 |
threading.Thread(target=SillyTavern, daemon=True).start()
|
|
|
|
|
|
|
| 507 |
check_api1()
|
| 508 |
|
| 509 |
if os.path.exists('/sillytavern/start.sh'):
|