vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Only call get_authenticated_* once in the track_and_log, and add better logging to it

Browse source
This commit is contained in:
Joseph Schorr 2015-01-04 14:50:08 -05:00
parent 30c7cbb80b
commit 8085ff81a8
1 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
endpoints/trackhelper.py
View file

@ -19,20 +19,23 @@ def track_and_log(event_name, repo, **kwargs):
analytics_id = 'anonymous' analytics_id = 'anonymous'
authenticated_oauth_token = get_validated_oauth_token()
authenticated_user = get_authenticated_user()
authenticated_token = get_validated_token() if not authenticated_user else None
profile.debug('Logging the %s to Mixpanel and the log system', event_name) profile.debug('Logging the %s to Mixpanel and the log system', event_name)
if get_validated_oauth_token(): if authenticated_oauth_token:
oauth_token = get_validated_oauth_token() metadata['oauth_token_id'] = authenticated_oauth_token.id
metadata['oauth_token_id'] = oauth_token.id metadata['oauth_token_application_id'] = authenticated_oauth_token.application.client_id
metadata['oauth_token_application_id'] = oauth_token.application.client_id metadata['oauth_token_application'] = authenticated_oauth_token.application.name
metadata['oauth_token_application'] = oauth_token.application.name analytics_id = 'oauth:' + authenticated_oauth_token.id
analytics_id = 'oauth:' + oauth_token.id elif authenticated_user:
elif get_authenticated_user(): metadata['username'] = authenticated_user.username
metadata['username'] = get_authenticated_user().username analytics_id = authenticated_user.username
analytics_id = get_authenticated_user().username elif authenticated_token:
elif get_validated_token(): metadata['token'] = authenticated_token.friendly_name
metadata['token'] = get_validated_token().friendly_name metadata['token_code'] = authenticated_token.code
metadata['token_code'] = get_validated_token().code analytics_id = 'token:' + authenticated_token.code
analytics_id = 'token:' + get_validated_token().code
else: else:
metadata['public'] = True metadata['public'] = True
analytics_id = 'anonymous' analytics_id = 'anonymous'
@ -42,21 +45,27 @@ def track_and_log(event_name, repo, **kwargs):
} }
# Publish the user event (if applicable) # Publish the user event (if applicable)
if get_authenticated_user(): profile.debug('Checking publishing %s to the user events system', event_name)
if authenticated_user:
profile.debug('Publishing %s to the user events system', event_name)
user_event_data = { user_event_data = {
'action': event_name, 'action': event_name,
'repository': repository, 'repository': repository,
'namespace': namespace 'namespace': namespace
} }
event = userevents.get_event(get_authenticated_user().username) event = userevents.get_event(authenticated_user.username)
event.publish_event_data('docker-cli', user_event_data) event.publish_event_data('docker-cli', user_event_data)
# Save the action to mixpanel. # Save the action to mixpanel.
profile.debug('Logging the %s to Mixpanel', event_name)
analytics.track(analytics_id, event_name, extra_params) analytics.track(analytics_id, event_name, extra_params)
# Log the action to the database. # Log the action to the database.
profile.debug('Logging the %s to logs system', event_name)
model.log_action(event_name, namespace, model.log_action(event_name, namespace,
performer=get_authenticated_user(), performer=authenticated_user,
ip=request.remote_addr, metadata=metadata, ip=request.remote_addr, metadata=metadata,
repository=repo) repository=repo)
profile.debug('Track and log of %s complete', event_name)