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

Merge branch 'master' of ssh://bitbucket.org/yackob03/quay

Browse source
This commit is contained in:
Jake Moshenko 2014-07-11 18:30:40 -04:00
commit 0df8fe031b
3 changed files with 21 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
static/js/app.js
View file

@ -432,9 +432,11 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
// If an error occurred, report it and done. // If an error occurred, report it and done.
if (ping < 0) { if (ping < 0) {
cached['pings'] = [-1]; cached['pings'] = [-1];
$scope.$apply(function() { setTimeout(function() {
callback(-1, false, -1); $scope.$apply(function() {
}); callback(-1, false, -1);
});
}, 0);
return; return;
} }
@ -447,9 +449,11 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
} }
// Report the average ping. // Report the average ping.
$scope.$apply(function() { setTimeout(function() {
callback(Math.floor(sum / cached['pings'].length), true, cached['pings'].length); $scope.$apply(function() {
}); callback(Math.floor(sum / cached['pings'].length), true, cached['pings'].length);
});
}, 0);
// Schedule another check if we've done less than three. // Schedule another check if we've done less than three.
if (cached['pings'].length < 3) { if (cached['pings'].length < 3) {
@ -486,9 +490,11 @@ quayApp = angular.module('quay', quayDependencies, function($provide, cfpLoading
pingService.pingUrl = function($scope, url, callback) { pingService.pingUrl = function($scope, url, callback) {
if (pingCache[url]) { if (pingCache[url]) {
cached = pingCache[url]; cached = pingCache[url];
$scope.$apply(function() { setTimeout(function() {
callback(cached.result, cached.success); $scope.$apply(function() {
}); callback(cached.result, cached.success);
});
}, 0);
return; return;
} }

2
test/testlogs.py
View file

@ -180,6 +180,8 @@ class TestBuildLogs(RedisBuildLogs):
def get_log_entries(self, build_id, start_index): def get_log_entries(self, build_id, start_index):
if build_id == self.test_build_id: if build_id == self.test_build_id:
return (len(self._logs), self._logs[start_index:]) return (len(self._logs), self._logs[start_index:])
elif not self.allow_delegate:
return None
else: else:
return super(TestBuildLogs, self).get_log_entries(build_id, start_index) return super(TestBuildLogs, self).get_log_entries(build_id, start_index)

4
workers/dockerfilebuild.py
View file

@ -545,6 +545,10 @@ class DockerfileBuildWorker(Worker):
# Need a separate handler for this so it doesn't get caught by catch all below # Need a separate handler for this so it doesn't get caught by catch all below
raise exc raise exc
except JobException as exc:
# Need a separate handler for this so it doesn't get caught by catch all below
raise exc
except Exception as exc: except Exception as exc:
sentry.client.captureException() sentry.client.captureException()
log_appender('error', build_logs.PHASE) log_appender('error', build_logs.PHASE)