From f0e5f39342fadcfdc626e06141cfdeba1af47d2e Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Tue, 22 Oct 2019 12:02:22 +0200 Subject: [PATCH] run server in ftrack server gives ability to use other session and not to load plugins --- pype/ftrack/ftrack_server/ftrack_server.py | 28 ++++++++++++---------- 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/pype/ftrack/ftrack_server/ftrack_server.py b/pype/ftrack/ftrack_server/ftrack_server.py index 612e89e60f..12b046c510 100644 --- a/pype/ftrack/ftrack_server/ftrack_server.py +++ b/pype/ftrack/ftrack_server/ftrack_server.py @@ -128,21 +128,25 @@ class FtrackServer: ) log.warning(msg, exc_info=True) - def run_server(self): - self.session = ftrack_api.Session(auto_connect_event_hub=True,) + def run_server(self, session=None, load_files=True): + if not session: + session = ftrack_api.Session(auto_connect_event_hub=True) - paths_str = os.environ.get(self.env_key) - if paths_str is None: - log.error(( - "Env var \"{}\" is not set, \"{}\" server won\'t launch" - ).format(self.env_key, self.server_type)) - return + self.session = session - paths = paths_str.split(os.pathsep) - self.set_files(paths) + if load_files: + paths_str = os.environ.get(self.env_key) + if paths_str is None: + log.error(( + "Env var \"{}\" is not set, \"{}\" server won\'t launch" + ).format(self.env_key, self.server_type)) + return - log.info(60*"*") - log.info('Registration of actions/events has finished!') + paths = paths_str.split(os.pathsep) + self.set_files(paths) + + log.info(60*"*") + log.info('Registration of actions/events has finished!') # keep event_hub on session running self.session.event_hub.wait()