Update server.py
Browse files
server.py
CHANGED
|
@@ -684,29 +684,24 @@ os.system("rm -r /qilan-st2.zip /sillytavern.tar.gz")
|
|
| 684 |
if os.path.exists(f'{data_folder}/start.sh'):
|
| 685 |
replace_info_in_file(f'{data_folder}/public/login.html')
|
| 686 |
# threading.Thread(target=repeat_task, daemon=True).start() #压缩备份
|
| 687 |
-
|
| 688 |
-
|
| 689 |
print("开始衔接")
|
| 690 |
Service_status = True
|
| 691 |
frp(configs, True)
|
| 692 |
-
# frp(config_data2,'/content/frp/frpc2.ini',True)
|
| 693 |
-
# frp(config_data,'/content/frp/frpc.ini',True)
|
| 694 |
-
# frp(config_data3,'/content/frp/frpc3.ini',True)
|
| 695 |
# frp(config_data4,'/content/frp/frpc4.ini',True)
|
| 696 |
# 以线程的形式运行 frp 任务
|
| 697 |
# frp_thread1 = threading.Thread(target=frp, args=(config_data2, '/content/frp/frpc2.ini', True))
|
| 698 |
# frp_thread1.start()
|
| 699 |
-
# frp_thread2 = threading.Thread(target=frp, args=(config_data, '/content/frp/frpc.ini', False))
|
| 700 |
-
# frp_thread2.start()
|
| 701 |
threading.Thread(target=monitor_port, daemon=True).start()#检测端口状态
|
| 702 |
while True:
|
| 703 |
-
|
| 704 |
-
|
| 705 |
-
|
| 706 |
-
|
| 707 |
-
|
| 708 |
-
|
| 709 |
-
|
| 710 |
time.sleep(5)
|
| 711 |
|
| 712 |
else:
|
|
|
|
| 684 |
if os.path.exists(f'{data_folder}/start.sh'):
|
| 685 |
replace_info_in_file(f'{data_folder}/public/login.html')
|
| 686 |
# threading.Thread(target=repeat_task, daemon=True).start() #压缩备份
|
| 687 |
+
backup_thread = threading.Thread(target=repeat_task, daemon=True)
|
| 688 |
+
backup_thread.start()
|
| 689 |
print("开始衔接")
|
| 690 |
Service_status = True
|
| 691 |
frp(configs, True)
|
|
|
|
|
|
|
|
|
|
| 692 |
# frp(config_data4,'/content/frp/frpc4.ini',True)
|
| 693 |
# 以线程的形式运行 frp 任务
|
| 694 |
# frp_thread1 = threading.Thread(target=frp, args=(config_data2, '/content/frp/frpc2.ini', True))
|
| 695 |
# frp_thread1.start()
|
|
|
|
|
|
|
| 696 |
threading.Thread(target=monitor_port, daemon=True).start()#检测端口状态
|
| 697 |
while True:
|
| 698 |
+
if backup_thread.is_alive():
|
| 699 |
+
print("备份线程仍在运行...")
|
| 700 |
+
else:
|
| 701 |
+
print("备份线程已停止.")
|
| 702 |
+
backup_thread = threading.Thread(target=repeat_task, daemon=True)
|
| 703 |
+
backup_thread.start()
|
| 704 |
+
break
|
| 705 |
time.sleep(5)
|
| 706 |
|
| 707 |
else:
|