Merge branch 'master' into redalert

This commit is contained in:
Joseph Schorr 2014-07-28 18:35:39 -04:00
commit 7de1dd7dc0
11 changed files with 32 additions and 50 deletions

View file

@ -69,6 +69,17 @@ def truthy_param(param):
return param not in {False, 'false', 'False', '0', 'FALSE', '', 'null'}
def param_required(param_name):
def wrapper(wrapped):
@wraps(wrapped)
def decorated(*args, **kwargs):
if param_name not in request.args:
abort(make_response('Required param: %s' % param_name, 400))
return wrapped(*args, **kwargs)
return decorated
return wrapper
@login_manager.user_loader
def load_user(username):
logger.debug('User loader loading deferred user: %s' % username)
@ -200,7 +211,7 @@ def start_build(repository, dockerfile_id, tags, build_name, subdir, manual,
build_request = model.create_repository_build(repository, token, job_config,
dockerfile_id, build_name,
trigger, pull_robot_name = pull_robot_name)
trigger, pull_robot_name=pull_robot_name)
dockerfile_build_queue.put([repository.namespace, repository.name], json.dumps({
'build_uuid': build_request.uuid,