Qilan2 commited on
Commit
9588501
·
verified ·
1 Parent(s): 7c44210

Update server2.py

Browse files
Files changed (1) hide show
  1. server2.py +23 -13
server2.py CHANGED
@@ -572,17 +572,26 @@ def monitor_port():
572
  print(f"端口 8000 正在使用中")
573
  else:
574
  print(f"端口 8000 未被使用")
 
 
575
  # 启动脚本并在后台运行
576
- try:
577
- os.chdir(data_folder)
578
- process = subprocess.Popen(f'node "server.js" "$@"', shell=True)
579
- print(f"已尝试启动 {data_folder }/start.sh")
580
- time.sleep(20)
581
- except Exception as e: # 捕获所有异常
582
- print(f"命令失败: {e}")
583
 
584
  time.sleep(5) # 每5秒检查一次
585
-
 
 
 
 
 
 
 
586
  def SillyTavern():
587
  print('-----------SillyTavern开始-------------')
588
  # 创建目录并写入 kaggle.json
@@ -650,11 +659,12 @@ def SillyTavern():
650
  print(f"Command '{e.cmd}' returned non-zero exit status {e.returncode}.")
651
  print("Output:", e.output)
652
  os.system(f"ls {data_folder}")
653
-
654
- subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
655
- subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
656
- subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
657
- subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
 
658
  print('-----------SillyTavern结束-------------')
659
  threading.Thread(target=SillyTavern, daemon=True).start()
660
  time.sleep(60)
 
572
  print(f"端口 8000 正在使用中")
573
  else:
574
  print(f"端口 8000 未被使用")
575
+ backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
576
+ backup_thread.start()
577
  # 启动脚本并在后台运行
578
+ # try:
579
+ # os.chdir(data_folder)
580
+ # process = subprocess.Popen(f'node "server.js" "$@"', shell=True)
581
+ # print(f"已尝试启动 {data_folder }/start.sh")
582
+ # # time.sleep(20)
583
+ # except Exception as e: # 捕获所有异常
584
+ # print(f"命令失败: {e}")
585
 
586
  time.sleep(5) # 每5秒检查一次
587
+ def Run_SillyTavern():
588
+ try:
589
+ os.chdir(data_folder)
590
+ process = subprocess.Popen(f'node "server.js" "$@"', shell=True)
591
+ print(f"已尝试启动 {data_folder }/start.sh")
592
+ # time.sleep(20)
593
+ except Exception as e: # 捕获所有异常
594
+ print(f"命令失败: {e}")
595
  def SillyTavern():
596
  print('-----------SillyTavern开始-------------')
597
  # 创建目录并写入 kaggle.json
 
659
  print(f"Command '{e.cmd}' returned non-zero exit status {e.returncode}.")
660
  print("Output:", e.output)
661
  os.system(f"ls {data_folder}")
662
+ backup_thread = threading.Thread(target=Run_SillyTavern, daemon=True)
663
+ backup_thread.start()
664
+ # subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
665
+ # subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
666
+ # subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
667
+ # subprocess.run(f'yes | sh {data_folder}/start.sh', shell=True, check=True)
668
  print('-----------SillyTavern结束-------------')
669
  threading.Thread(target=SillyTavern, daemon=True).start()
670
  time.sleep(60)