moved scripts to scripts folder

This commit is contained in:
iLLiCiTiT 2021-03-18 14:25:48 +01:00
parent 0f5d7df35d
commit a8ab4d288b
7 changed files with 9 additions and 7 deletions

View file

@ -18,6 +18,7 @@ from pype.lib import (
get_pype_execute_args,
PypeMongoConnection
)
from pype.modules.ftrack import FTRACK_MODULE_DIR
from pype.modules.ftrack.lib import (
credentials,
get_ftrack_url_from_settings
@ -98,14 +99,14 @@ def validate_credentials(url, user, api):
def legacy_server(ftrack_url):
# Current file
file_path = os.path.dirname(os.path.realpath(__file__))
scripts_dir = os.path.join(FTRACK_MODULE_DIR, "scripts")
min_fail_seconds = 5
max_fail_count = 3
wait_time_after_max_fail = 10
subproc = None
subproc_path = "{}/sub_legacy_server.py".format(file_path)
subproc_path = "{}/sub_legacy_server.py".format(scripts_dir)
subproc_last_failed = datetime.datetime.now()
subproc_failed_count = 0
@ -183,7 +184,7 @@ def main_loop(ftrack_url):
mongo_uri = PypeMongoConnection.get_default_mongo_url()
# Current file
file_path = os.path.dirname(os.path.realpath(__file__))
scripts_dir = os.path.join(FTRACK_MODULE_DIR, "scripts")
min_fail_seconds = 5
max_fail_count = 3
@ -192,21 +193,21 @@ def main_loop(ftrack_url):
# Threads data
storer_name = "StorerThread"
storer_port = 10001
storer_path = "{}/sub_event_storer.py".format(file_path)
storer_path = "{}/sub_event_storer.py".format(scripts_dir)
storer_thread = None
storer_last_failed = datetime.datetime.now()
storer_failed_count = 0
processor_name = "ProcessorThread"
processor_port = 10011
processor_path = "{}/sub_event_processor.py".format(file_path)
processor_path = "{}/sub_event_processor.py".format(scripts_dir)
processor_thread = None
processor_last_failed = datetime.datetime.now()
processor_failed_count = 0
statuser_name = "StorerThread"
statuser_port = 10021
statuser_path = "{}/sub_event_status.py".format(file_path)
statuser_path = "{}/sub_event_status.py".format(scripts_dir)
statuser_thread = None
statuser_last_failed = datetime.datetime.now()
statuser_failed_count = 0

View file

@ -8,6 +8,7 @@ import ftrack_api
from ..ftrack_server.lib import check_ftrack_url
from ..ftrack_server import socket_thread
from ..lib import credentials
from ..ftrack_module import FTRACK_MODULE_DIR
from . import login_dialog
from pype.api import Logger, resources
@ -132,7 +133,7 @@ class FtrackTrayWrapper:
thread_name = "ActionServerThread"
thread_port = 10021
subprocess_path = (
"{}/ftrack_server/sub_user_server.py".format(parent_file_path)
"{}/scripts/sub_user_server.py".format(FTRACK_MODULE_DIR)
)
if self.thread_socket_server is not None:
self.thread_socket_server.stop()