diff --git a/pype/modules/ftrack/ftrack_server/sub_event_processor.py b/pype/modules/ftrack/ftrack_server/sub_event_processor.py index 6cf0ccf63b..77dc85b0a2 100644 --- a/pype/modules/ftrack/ftrack_server/sub_event_processor.py +++ b/pype/modules/ftrack/ftrack_server/sub_event_processor.py @@ -10,7 +10,7 @@ from pype.modules.ftrack.ftrack_server.lib import ( ProcessEventHub, TOPIC_STATUS_SERVER ) -from pype.modules.ftrack.lib import get_server_event_handler_paths +from pype.modules import ModulesManager from pype.api import Logger @@ -80,8 +80,12 @@ def main(args): register(session) SessionFactory.session = session - event_handler_paths = get_server_event_handler_paths() - server = FtrackServer(event_handler_paths, "event") + manager = ModulesManager() + ftrack_module = manager.modules_by_name["ftrack"] + server = FtrackServer( + ftrack_module.server_event_handlers_paths, + "event" + ) log.debug("Launched Ftrack Event processor") server.run_server(session) diff --git a/pype/modules/ftrack/ftrack_server/sub_legacy_server.py b/pype/modules/ftrack/ftrack_server/sub_legacy_server.py index bd5962d04a..ecb12830c4 100644 --- a/pype/modules/ftrack/ftrack_server/sub_legacy_server.py +++ b/pype/modules/ftrack/ftrack_server/sub_legacy_server.py @@ -7,9 +7,7 @@ import threading from ftrack_server import FtrackServer import ftrack_api from pype.api import Logger -from pype.modules.ftrack.ftrack_server.lib import ( - get_server_event_handler_paths -) +from pype.modules import ModulesManager log = Logger().get_logger("Event Server Legacy") @@ -65,8 +63,12 @@ class TimerChecker(threading.Thread): def main(args): check_thread = None try: - event_handler_paths = get_server_event_handler_paths() - server = FtrackServer(event_handler_paths, "event") + manager = ModulesManager() + ftrack_module = manager.modules_by_name["ftrack"] + server = FtrackServer( + ftrack_module.server_event_handlers_paths, + "event" + ) session = ftrack_api.Session(auto_connect_event_hub=True) check_thread = TimerChecker(server, session) diff --git a/pype/modules/ftrack/lib/__init__.py b/pype/modules/ftrack/lib/__init__.py index f534d22564..82b6875590 100644 --- a/pype/modules/ftrack/lib/__init__.py +++ b/pype/modules/ftrack/lib/__init__.py @@ -1,8 +1,5 @@ from . settings import ( - FTRACK_MODULE_DIR, - SERVER_HANDLERS_DIR, get_ftrack_url_from_settings, - get_server_event_handler_paths, get_ftrack_event_mongo_info ) from . import avalon_sync @@ -13,10 +10,7 @@ from .ftrack_action_handler import BaseAction, ServerAction, statics_icon __all__ = ( - "FTRACK_MODULE_DIR", - "SERVER_HANDLERS_DIR", "get_ftrack_url_from_settings", - "get_server_event_handler_paths", "get_ftrack_event_mongo_info", "avalon_sync", diff --git a/pype/modules/ftrack/lib/settings.py b/pype/modules/ftrack/lib/settings.py index 84872d141a..1167d5443e 100644 --- a/pype/modules/ftrack/lib/settings.py +++ b/pype/modules/ftrack/lib/settings.py @@ -9,9 +9,6 @@ from pype.api import ( log = Logger().get_logger(__name__) -FTRACK_MODULE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) -SERVER_HANDLERS_DIR = os.path.join(FTRACK_MODULE_DIR, "events") - def get_ftrack_settings(): return get_system_settings()["modules"]["ftrack"] @@ -21,55 +18,6 @@ def get_ftrack_url_from_settings(): return get_ftrack_settings()["ftrack_server"] -def get_server_event_handler_paths(): - paths = [] - # Environment variable overrides settings - if "FTRACK_EVENTS_PATH" in os.environ: - env_paths = os.environ.get("FTRACK_EVENTS_PATH") - paths.extend(env_paths.split(os.pathsep)) - return paths - - # Add pype's default dir - paths.append(SERVER_HANDLERS_DIR) - # Add additional paths from settings - paths.extend( - get_ftrack_settings()["ftrack_events_path"] - ) - try: - clockify_path = clockify_event_path() - if clockify_path: - paths.append(clockify_path) - except Exception: - log.warning("Clockify paths function failed.", exc_info=True) - - # Filter only existing paths - _paths = [] - for path in paths: - if os.path.exists(path): - _paths.append(path) - else: - log.warning(( - "Registered event handler path is not accessible: {}" - ).format(path)) - return _paths - - -def clockify_event_path(): - api_key = os.environ.get("CLOCKIFY_API_KEY") - if not api_key: - log.warning("Clockify API key is not set.") - return - - workspace_name = os.environ.get("CLOCKIFY_WORKSPACE") - if not workspace_name: - log.warning("Clockify Workspace is not set.") - return - - from pype.modules.clockify.constants import CLOCKIFY_FTRACK_SERVER_PATH - - return CLOCKIFY_FTRACK_SERVER_PATH - - def get_ftrack_event_mongo_info(): ftrack_settings = get_ftrack_settings() database_name = ftrack_settings["mongo_database_name"]