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

Fix the spawn_notification to work in all cases and clean up some of the remaining code

Browse source
This commit is contained in:
Joseph Schorr 2014-07-18 16:34:52 -04:00
parent 591cd020b8
commit 752efb9e0f
17 changed files with 18379 additions and 18415 deletions
Download patch file Download diff file Expand all files Collapse all files

16
workers/dockerfilebuild.py
View file

@ -24,7 +24,7 @@ from collections import defaultdict
from data import model
from workers.worker import Worker, WorkerUnhealthyException, JobException
from app import userfiles as user_files, build_logs, sentry, dockerfile_build_queue
from endpoints.common import spawn_notification
from endpoints.notificationhelper import spawn_notification
from util.safetar import safe_extractall
from util.dockerfileparse import parse_dockerfile, ParsedDockerfile, serialize_dockerfile
@ -510,15 +510,15 @@ class DockerfileBuildWorker(Worker):
'trigger_kind': repository_build.trigger.service.name
}
spawn_notification(repository, 'build_start', event_data,
subpage='build?current=' % repository_build.uuid,
spawn_notification(repository_build.repository, 'build_start', event_data,
subpage='build?current=%s' % repository_build.uuid,
pathargs=['build', repository_build.uuid])
# Setup a handler for spawning failure messages.
def spawn_failure(message, event_data):
event_data['error_message'] = exc.message
spawn_notification(repository, 'build_failure', event_data,
subpage='build?current=' % repository_build.uuid,
event_data['error_message'] = message
spawn_notification(repository_build.repository, 'build_failure', event_data,
subpage='build?current=%s' % repository_build.uuid,
pathargs=['build', repository_build.uuid])
# Start the build process.
@ -563,8 +563,8 @@ class DockerfileBuildWorker(Worker):
repository_build.save()
# Spawn a notification that the build has completed.
spawn_notification(repository, 'build_success', event_data,
subpage='build?current=' % repository_build.uuid,
spawn_notification(repository_build.repository, 'build_success', event_data,
subpage='build?current=%s' % repository_build.uuid,
pathargs=['build', repository_build.uuid])
except WorkerUnhealthyException as exc: