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

Move log descriptions into the client side

Browse source
This commit is contained in:
Joseph Schorr 2013-11-29 00:04:50 -05:00
parent 378aebe1ec
commit b77dabd586
5 changed files with 104 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

24
endpoints/index.py
View file

@ -179,15 +179,12 @@ def create_repository(namespace, repository):
mixpanel.track(get_authenticated_user().username, 'push_repo',
extra_params)
metadata['username'] = get_authenticated_user().username
description = 'Repository {repo} pushed by user {username}'
else:
mixpanel.track(get_validated_token().code, 'push_repo', extra_params)
metadata['token'] = get_validated_token().friendly_name
metadata['token_code'] = get_validated_token().code
description = 'Repository {repo} pushed via access token {token}'
model.log_action('push_repo', namespace, performer = get_authenticated_user(), ip = request.remote_addr,
description = description,
metadata = metadata,
repository = repo)
@ -266,9 +263,17 @@ def get_repository_images(namespace, repository):
resp = make_response(json.dumps(all_images), 200)
resp.mimetype = 'application/json'
pull_username = 'anonymous'
metadata = {
'repo': repository,
'namespace': namespace,
}
if get_authenticated_user():
pull_username = get_authenticated_user().username
metadata['username']= get_authenticated_user().username
elif get_validated_token():
metadata['token'] = get_validated_token().friendly_name
metadata['token_code'] = get_validated_token().code
else:
metadata['public'] = True
extra_params = {
'repository': '%s/%s' % (namespace, repository),
@ -276,14 +281,7 @@ def get_repository_images(namespace, repository):
mixpanel.track(pull_username, 'pull_repo', extra_params)
model.log_action('pull_repo', namespace, performer = get_authenticated_user(), ip = request.remote_addr,
description = 'Repository {repo} pulled',
metadata = {
'repo': repository,
'namespace': namespace,
'username': pull_username,
'public': is_public
},
repository = repo)
metadata = metadata, repository = repo)
return resp
abort(403)