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

Add logging descriptions for the new trigger logs

Browse source
This commit is contained in:
Joseph Schorr 2014-02-25 18:22:55 -05:00
parent c3c26ba199
commit e687b4d2d4
4 changed files with 113 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

21
endpoints/api.py
View file

@ -1440,9 +1440,9 @@ def activate_build_trigger(namespace, repository, trigger_uuid):
'write')
try:
repository = '%s/%s' % (trigger.repository.namespace,
trigger.repository.name)
path = url_for('webhooks.build_trigger_webhook', repository=repository,
repository_path = '%s/%s' % (trigger.repository.namespace,
trigger.repository.name)
path = url_for('webhooks.build_trigger_webhook', repository=repository_path,
trigger_uuid=trigger.uuid)
authed_url = _prepare_webhook_url(app.config['URL_SCHEME'], '$token',
token.code, app.config['URL_HOST'],
@ -1460,6 +1460,13 @@ def activate_build_trigger(namespace, repository, trigger_uuid):
trigger.write_token = token
trigger.save()
# Log the trigger setup.
repo = model.get_repository(namespace, repository)
log_action('setup_repo_trigger', namespace,
{'repo': repository, 'namespace': namespace,
'trigger_id': trigger.uuid, 'service': trigger.service.name,
'config': final_config}, repo=repo)
return jsonify(trigger_view(trigger))
abort(403) # Permission denied
@ -1542,10 +1549,12 @@ def delete_build_trigger(namespace, repository, trigger_uuid):
# We are just going to eat this error
logger.warning('Trigger deactivation problem.', ex)
log_action('delete_repo_trigger', namespace,
{'repo': repository, 'trigger_id': trigger_uuid,
'service': trigger.service.name, 'config': config_dict},
repo=model.get_repository(namespace, repository))
trigger.delete_instance()
log_action('delete_repo_trigger', namespace,
{'repo': repository, 'trigger_id': trigger_uuid},
repo=model.get_repository(namespace, repository))
return make_response('No Content', 204)
abort(403) # Permission denied

23
endpoints/webhooks.py
View file

@ -63,9 +63,9 @@ def build_trigger_webhook(namespace, repository, trigger_uuid):
handler = BuildTrigger.get_trigger_for_service(trigger.service.name)
logger.debug('Passing webhook request to handler %s', handler)
config_dict = json.loads(trigger.config)
try:
specs = handler.handle_trigger_request(request, trigger.auth_token,
json.loads(trigger.config))
specs = handler.handle_trigger_request(request, trigger.auth_token, config_dict)
dockerfile_id, tags, name, subdir = specs
except ValidationRequestException:
@ -73,12 +73,12 @@ def build_trigger_webhook(namespace, repository, trigger_uuid):
return make_response('Okay')
host = urlparse.urlparse(request.url).netloc
repo = '%s/%s/%s' % (host, trigger.repository.namespace,
trigger.repository.name)
repo_path = '%s/%s/%s' % (host, trigger.repository.namespace,
trigger.repository.name)
token = model.create_access_token(trigger.repository, 'write')
logger.debug('Creating build %s with repo %s tags %s and dockerfile_id %s',
name, repo, tags, dockerfile_id)
name, repo_path, tags, dockerfile_id)
job_config = {
'docker_tags': tags,
@ -95,6 +95,17 @@ def build_trigger_webhook(namespace, repository, trigger_uuid):
'repository': repository,
}), retries_remaining=1)
metadata = {
'repo': repository,
'namespace': namespace,
'trigger_id': trigger_uuid,
'fileid': dockerfile_id,
'config': config_dict,
'service': trigger.service.name
}
repo = model.get_repository(namespace, repository)
model.log_action('build_dockerfile', namespace, ip=request.remote_addr, metadata=metadata, repository=repo)
return make_response('Okay')
abort(403)
abort(403)