Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-24 21:04:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'hotfix/sigkill_arguments'

Browse source
This commit is contained in:
Milan Kolar 2019-11-11 12:20:00 +01:00
commit 43d916af6a
4 changed files with 7 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
pype/ftrack/ftrack_server/event_server_cli.py
View file

@ -78,10 +78,10 @@ def check_mongo_url(host, port, log_error=False):
def validate_credentials(url, user, api): def validate_credentials(url, user, api):
first_validation = True first_validation = True
if not user: if not user:
print('ERROR: Ftrack Username is not set! Exiting.') print('- Ftrack Username is not set')
first_validation = False first_validation = False
if not api: if not api:
print('ERROR: Ftrack API key is not set! Exiting.') print('- Ftrack API key is not set')
first_validation = False first_validation = False
if not first_validation: if not first_validation:
return False return False
@ -491,10 +491,12 @@ def main(argv):
# Check url regex and accessibility # Check url regex and accessibility
ftrack_url = check_ftrack_url(ftrack_url) ftrack_url = check_ftrack_url(ftrack_url)
if not ftrack_url: if not ftrack_url:
print('Exiting! < Please enter Ftrack server url >')
return 1 return 1
# Validate entered credentials # Validate entered credentials
if not validate_credentials(ftrack_url, username, api_key): if not validate_credentials(ftrack_url, username, api_key):
print('Exiting! < Please enter valid credentials >')
return 1 return 1
# Process events path # Process events path
@ -534,8 +536,4 @@ if __name__ == "__main__":
signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler) signal.signal(signal.SIGTERM, signal_handler)
try:
signal.signal(signal.SIGKILL, signal_handler)
except OSError:
pass
sys.exit(main(sys.argv)) sys.exit(main(sys.argv))

5
pype/ftrack/ftrack_server/sub_event_processor.py
View file

@ -47,8 +47,5 @@ if __name__ == "__main__":
signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler) signal.signal(signal.SIGTERM, signal_handler)
try:
signal.signal(signal.SIGKILL, signal_handler)
except OSError:
pass
sys.exit(main(sys.argv)) sys.exit(main(sys.argv))

5
pype/ftrack/ftrack_server/sub_event_storer.py
View file

@ -112,8 +112,5 @@ if __name__ == "__main__":
signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler) signal.signal(signal.SIGTERM, signal_handler)
try:
signal.signal(signal.SIGKILL, signal_handler)
except OSError:
pass
sys.exit(main(sys.argv)) sys.exit(main(sys.argv))

5
pype/ftrack/ftrack_server/sub_legacy_server.py
View file

@ -94,8 +94,5 @@ if __name__ == "__main__":
signal.signal(signal.SIGINT, signal_handler) signal.signal(signal.SIGINT, signal_handler)
signal.signal(signal.SIGTERM, signal_handler) signal.signal(signal.SIGTERM, signal_handler)
try:
signal.signal(signal.SIGKILL, signal_handler)
except OSError:
pass
sys.exit(main(sys.argv)) sys.exit(main(sys.argv))