From aad641f233e76791626bb38979f30c5b65d6ef62 Mon Sep 17 00:00:00 2001 From: iLLiCiTiT Date: Wed, 23 Oct 2019 16:48:13 +0200 Subject: [PATCH] import fixes --- pype/ftrack/ftrack_server/__init__.py | 7 ------- pype/ftrack/ftrack_server/socket_thread.py | 7 ------- pype/ftrack/ftrack_server/sub_event_processor.py | 4 ++-- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/pype/ftrack/ftrack_server/__init__.py b/pype/ftrack/ftrack_server/__init__.py index f8f876bbb6..0861a1bc08 100644 --- a/pype/ftrack/ftrack_server/__init__.py +++ b/pype/ftrack/ftrack_server/__init__.py @@ -1,8 +1 @@ from .ftrack_server import FtrackServer - -import event_server_cli -import session_processor -import session_storer -import socket_thread -import sub_event_processor -import sub_event_storer diff --git a/pype/ftrack/ftrack_server/socket_thread.py b/pype/ftrack/ftrack_server/socket_thread.py index e787004afc..8d700d7255 100644 --- a/pype/ftrack/ftrack_server/socket_thread.py +++ b/pype/ftrack/ftrack_server/socket_thread.py @@ -25,13 +25,6 @@ class SocketThread(threading.Thread): def stop(self): self._is_running = False - def process_to_die(self): - if not self.connection: - self.stop() - return - - self.connection.sendall(b"ptd") - def run(self): self._is_running = True time_socket = time.time() diff --git a/pype/ftrack/ftrack_server/sub_event_processor.py b/pype/ftrack/ftrack_server/sub_event_processor.py index b53c294981..a8f2dc5041 100644 --- a/pype/ftrack/ftrack_server/sub_event_processor.py +++ b/pype/ftrack/ftrack_server/sub_event_processor.py @@ -6,7 +6,7 @@ import socket import pymongo from ftrack_server import FtrackServer -import session_processor +from pype.ftrack.ftrack_server.session_processor import ProcessSession from pypeapp import Logger log = Logger().get_logger("Event processor") @@ -24,7 +24,7 @@ def main(args): sock.sendall(b"CreatedProcess") try: - session = session_processor.ProcessSession(auto_connect_event_hub=True, sock=sock) + session = ProcessSession(auto_connect_event_hub=True, sock=sock) server = FtrackServer('event') log.debug("Launched Ftrack Event processor") server.run_server(session)