From dd967d87aa207e3a69669d81cf8a335e0e0e6392 Mon Sep 17 00:00:00 2001 From: Jakub Jezek Date: Wed, 6 Nov 2019 14:06:06 +0100 Subject: [PATCH] fix(ftrack): signals for linux --- pype/ftrack/events/event_sync_to_avalon.py | 2 ++ pype/ftrack/ftrack_server/event_server_cli.py | 6 ++++-- pype/ftrack/ftrack_server/sub_event_processor.py | 5 +++-- pype/ftrack/ftrack_server/sub_event_storer.py | 5 +++-- pype/ftrack/ftrack_server/sub_legacy_server.py | 5 +++-- 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/pype/ftrack/events/event_sync_to_avalon.py b/pype/ftrack/events/event_sync_to_avalon.py index a25866be65..3fe65bca11 100644 --- a/pype/ftrack/events/event_sync_to_avalon.py +++ b/pype/ftrack/events/event_sync_to_avalon.py @@ -101,6 +101,8 @@ class Sync_to_Avalon(BaseEvent): avalon_project = result['project'] except Exception as e: + session.reset() # reset session to clear it + message = str(e) title = 'Hey You! Unknown Error has been raised! (*look below*)' ftrack_message = ( diff --git a/pype/ftrack/ftrack_server/event_server_cli.py b/pype/ftrack/ftrack_server/event_server_cli.py index ec7cac9d6a..751d91ad4b 100644 --- a/pype/ftrack/ftrack_server/event_server_cli.py +++ b/pype/ftrack/ftrack_server/event_server_cli.py @@ -533,7 +533,9 @@ if __name__ == "__main__": signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGTERM, signal_handler) - if hasattr(signal, "SIGKILL"): - signal.signal(signal.SIGKILL, signal_handler) + try: + signal.signal(signal.SIGKILL, signal_handler) + except OSError: + pass sys.exit(main(sys.argv)) diff --git a/pype/ftrack/ftrack_server/sub_event_processor.py b/pype/ftrack/ftrack_server/sub_event_processor.py index 9444fe3ff0..4772c1e85e 100644 --- a/pype/ftrack/ftrack_server/sub_event_processor.py +++ b/pype/ftrack/ftrack_server/sub_event_processor.py @@ -47,7 +47,8 @@ if __name__ == "__main__": signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGTERM, signal_handler) - if hasattr(signal, "SIGKILL"): + try: signal.signal(signal.SIGKILL, signal_handler) - + except OSError: + pass sys.exit(main(sys.argv)) diff --git a/pype/ftrack/ftrack_server/sub_event_storer.py b/pype/ftrack/ftrack_server/sub_event_storer.py index 6e30fb99e2..a49561cfaf 100644 --- a/pype/ftrack/ftrack_server/sub_event_storer.py +++ b/pype/ftrack/ftrack_server/sub_event_storer.py @@ -112,7 +112,8 @@ if __name__ == "__main__": signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGTERM, signal_handler) - if hasattr(signal, "SIGKILL"): + try: signal.signal(signal.SIGKILL, signal_handler) - + except OSError: + pass sys.exit(main(sys.argv)) diff --git a/pype/ftrack/ftrack_server/sub_legacy_server.py b/pype/ftrack/ftrack_server/sub_legacy_server.py index c162b1abe1..01b1563db5 100644 --- a/pype/ftrack/ftrack_server/sub_legacy_server.py +++ b/pype/ftrack/ftrack_server/sub_legacy_server.py @@ -94,7 +94,8 @@ if __name__ == "__main__": signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGTERM, signal_handler) - if hasattr(signal, "SIGKILL"): + try: signal.signal(signal.SIGKILL, signal_handler) - + except OSError: + pass sys.exit(main(sys.argv))