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

Merge pull request #2663 from coreos-inc/multi-instance-su-panel

Browse source 
Disable debug logs in superuser panel when under multiple instances
This commit is contained in:
josephschorr 2017-07-19 17:28:05 -04:00 • committed by GitHub
commit b8e5a21736
3 changed files with 40 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

16
static/js/pages/superuser.js
View file

@ -18,10 +18,12 @@
// Monitor any user changes and place the current user into the scope.
UserService.updateUserIn($scope);
$scope.multipleInstances = false;
$scope.configStatus = null;
$scope.requiresRestart = null;
$scope.logsCounter = 0;
$scope.changeLog = null;
$scope.logsInstance = null;
$scope.debugServices = null;
$scope.debugLogs = null;
$scope.pollChannel = null;
@ -83,6 +85,13 @@
});
ApiService.getSystemLogs(null, params, /* background */true).then(function(resp) {
if ($scope.logsInstance != null && $scope.logsInstance != resp['instance']) {
$scope.multipleInstances = true;
callback(false);
return;
}
$scope.logsInstance = resp['instance'];
$scope.debugLogs = resp['logs'];
callback(true);
}, errorHandler);
@ -96,6 +105,13 @@
$scope.debugService = null;
ApiService.listSystemLogServices().then(function(resp) {
if ($scope.logsInstance != null && $scope.logsInstance != resp['instance']) {
$scope.multipleInstances = true;
callback(false);
return;
}
$scope.logsInstance = resp['instance'];
$scope.debugServices = resp['services'];
}, ApiService.errorDisplay('Cannot load system logs. Please contact support.'))
};