sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 13:59:02 +08:00
Code

Fix: stop FGO-py before join logger thread

Browse Source
This commit is contained in:
hgjazhgj 2023-05-30 19:59:54 +08:00
parent a88156fced
commit 2621c802d9
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
submodule/AlasFpyBridge/fpy.py
View File

@ -104,6 +104,7 @@ def export_method(func):
script = FgoAutoScript(config_name) script = FgoAutoScript(config_name)
script.config.bind(inflection.camelize(func.__name__)) script.config.bind(inflection.camelize(func.__name__))
getattr(script, func.__name__)() getattr(script, func.__name__)()
script.app.pipe.stdin.close()
script.app.logger.join(10) script.app.logger.join(10)
return wrapper return wrapper

1
submodule/AlasFpyBridge/module/FGOpy.py
View File

@ -37,7 +37,6 @@ class FGOpy(HeadlessCliApplication):
def callback(self, line): def callback(self, line):
if line == "exited": if line == "exited":
self.last_error = "exited" self.last_error = "exited"
self.orphan_slayer.kill()
if self.mutex.locked(): if self.mutex.locked():
self.mutex.release() self.mutex.release()
return return

10
submodule/AlasFpyBridge/module/utils/headlessCliApplication.py
View File

@ -19,12 +19,10 @@ class HeadlessCliApplication:
if not line: if not line:
break break
self.callback(line[:-1]) self.callback(line[:-1])
try: if hasattr(self, "orphan_slayer"):
self.pipe.wait(10) self.orphan_slayer.kill()
except TimeoutExpired: self.pipe.kill()
self.pipe.kill() self.callback("exited")
finally:
self.callback("exited")
self.logger = Thread(target=f, daemon=True) self.logger = Thread(target=f, daemon=True)
self.logger.start() self.logger.start()