epic/play-with-docker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure instance exists before trying to do anything

Browse Source
This commit is contained in:
Jonathan Leibiusky @xetorthio
2017-11-01 14:56:22 -03:00
parent 8f484ad5be
commit ba8d04aeb2
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
www/assets/app.js
View File

@@ -240,7 +240,9 @@
socket.on('instance terminal status', function(name, status) { socket.on('instance terminal status', function(name, status) {
var instance = $scope.idx[name]; var instance = $scope.idx[name];
instance.status = status; if (instance) {
instance.status = status;
}
}); });
socket.on('session ready', function(ready) { socket.on('session ready', function(ready) {
@@ -253,6 +255,9 @@
socket.on('instance terminal out', function(name, data) { socket.on('instance terminal out', function(name, data) {
var instance = $scope.idx[name]; var instance = $scope.idx[name];
if (!instance) {
return;
}
if (!instance) { if (!instance) {
// instance is new and was created from another client, we should add it // instance is new and was created from another client, we should add it
@@ -303,12 +308,18 @@
}); });
socket.on('instance stats', function(stats) { socket.on('instance stats', function(stats) {
if (! $scope.idx[stats.instance]) {
return
}
$scope.idx[stats.instance].mem = stats.mem; $scope.idx[stats.instance].mem = stats.mem;
$scope.idx[stats.instance].cpu = stats.cpu; $scope.idx[stats.instance].cpu = stats.cpu;
$scope.$apply(); $scope.$apply();
}); });
socket.on('instance docker swarm status', function(status) { socket.on('instance docker swarm status', function(status) {
if (!$scope.idx[status.instance]) {
return
}
if (status.is_manager) { if (status.is_manager) {
$scope.idx[status.instance].isManager = true $scope.idx[status.instance].isManager = true
} else if (status.is_worker) { } else if (status.is_worker) {
@@ -316,20 +327,23 @@
} else { } else {
$scope.idx[status.instance].isManager = null $scope.idx[status.instance].isManager = null
} }
$scope.$apply(); $scope.$apply();
}); });
socket.on('instance docker ports', function(status) { socket.on('instance docker ports', function(status) {
if ($scope.idx[status.instance]) { if (!$scope.idx[status.instance]) {
$scope.idx[status.instance].ports = status.ports; return
$scope.$apply();
} }
$scope.idx[status.instance].ports = status.ports;
$scope.$apply();
}); });
socket.on('instance docker swarm ports', function(status) { socket.on('instance docker swarm ports', function(status) {
for(var i in status.instances) { for(var i in status.instances) {
var instance = status.instances[i]; var instance = status.instances[i];
$scope.idxByHostname[instance].swarmPorts = status.ports; if ($scope.idxByHostname[instance]) {
$scope.idxByHostname[instance].swarmPorts = status.ports;
}
} }
$scope.$apply(); $scope.$apply();
}); });