diff --git a/pype/ftrack/ftrack_server/event_server_cli.py b/pype/ftrack/ftrack_server/event_server_cli.py index 751d91ad4b..ba23857394 100644 --- a/pype/ftrack/ftrack_server/event_server_cli.py +++ b/pype/ftrack/ftrack_server/event_server_cli.py @@ -78,10 +78,10 @@ def check_mongo_url(host, port, log_error=False): def validate_credentials(url, user, api): first_validation = True if not user: - print('ERROR: Ftrack Username is not set! Exiting.') + print('- Ftrack Username is not set') first_validation = False if not api: - print('ERROR: Ftrack API key is not set! Exiting.') + print('- Ftrack API key is not set') first_validation = False if not first_validation: return False @@ -491,10 +491,12 @@ def main(argv): # Check url regex and accessibility ftrack_url = check_ftrack_url(ftrack_url) if not ftrack_url: + print('Exiting! < Please enter Ftrack server url >') return 1 # Validate entered credentials if not validate_credentials(ftrack_url, username, api_key): + print('Exiting! < Please enter valid credentials >') return 1 # Process events path @@ -534,8 +536,4 @@ if __name__ == "__main__": signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGTERM, 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 4772c1e85e..01fa64fdd0 100644 --- a/pype/ftrack/ftrack_server/sub_event_processor.py +++ b/pype/ftrack/ftrack_server/sub_event_processor.py @@ -47,8 +47,5 @@ if __name__ == "__main__": signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGTERM, 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_storer.py b/pype/ftrack/ftrack_server/sub_event_storer.py index a49561cfaf..aaaf63accd 100644 --- a/pype/ftrack/ftrack_server/sub_event_storer.py +++ b/pype/ftrack/ftrack_server/sub_event_storer.py @@ -112,8 +112,5 @@ if __name__ == "__main__": signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGTERM, 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_legacy_server.py b/pype/ftrack/ftrack_server/sub_legacy_server.py index 01b1563db5..3d364e0ba3 100644 --- a/pype/ftrack/ftrack_server/sub_legacy_server.py +++ b/pype/ftrack/ftrack_server/sub_legacy_server.py @@ -94,8 +94,5 @@ if __name__ == "__main__": signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGTERM, signal_handler) - try: - signal.signal(signal.SIGKILL, signal_handler) - except OSError: - pass + sys.exit(main(sys.argv))