Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-25 05:14:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

'remove_tray_server_url' has force option

Browse source
This commit is contained in:
Jakub Trllo 2024-07-24 10:48:16 +02:00
parent aee9bd3f81
commit 43f9f51145
1 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

19
client/ayon_core/tools/tray/lib.py
View file

@ -191,19 +191,26 @@ def set_tray_server_url(tray_url: Optional[str], started: bool):
json.dump(data, stream)
def remove_tray_server_url():
def remove_tray_server_url(force: Optional[bool] = False):
"""Remove tray information file.
Called from tray logic, do not use on your own.
Args:
force (Optional[bool]): Force remove tray information file.
"""
filepath = _get_tray_info_filepath()
if not os.path.exists(filepath):
return
with open(filepath, "r") as stream:
data = json.load(stream)
try:
with open(filepath, "r") as stream:
data = json.load(stream)
except BaseException:
data = {}
if data.get("pid") == os.getpid():
if force or not data or data.get("pid") == os.getpid():
os.remove(filepath)
@ -250,7 +257,7 @@ def get_tray_state(
info = _get_tray_information(tray_url)
if not info:
# Remove the information as the tray is not running
remove_tray_server_url()
remove_tray_server_url(force=True)
return TrayState.NOT_RUNNING
return TrayState.RUNNING
@ -296,7 +303,7 @@ def main():
pid = file_info.get("pid")
if pid is not None:
os.kill(pid, signal.SIGTERM)
remove_tray_server_url()
remove_tray_server_url(force=True)
# Prepare the file with 'pid' information as soon as possible
try: