reworked container data fetching
Currently it would log "container not found" even if the container was found
This commit is contained in:
parent
d8b2a3bb46
commit
6014189be3
1 changed files with 28 additions and 21 deletions
|
@ -107,6 +107,8 @@ async function getStatus(entry: Service, containers: Dockerode.ContainerInfo[])
|
||||||
}
|
}
|
||||||
// Type Docker
|
// Type Docker
|
||||||
else if (entry.type === ServiceType.docker) {
|
else if (entry.type === ServiceType.docker) {
|
||||||
|
if (entry.name !== null) {
|
||||||
|
let found = false;
|
||||||
for (let i = 0; i < containers.length; i++) {
|
for (let i = 0; i < containers.length; i++) {
|
||||||
const container = containers[i];
|
const container = containers[i];
|
||||||
// Docker API returns container names with / prepended
|
// Docker API returns container names with / prepended
|
||||||
|
@ -120,20 +122,25 @@ async function getStatus(entry: Service, containers: Dockerode.ContainerInfo[])
|
||||||
console.log("Container Status " + container.State + " has no case implemented");
|
console.log("Container Status " + container.State + " has no case implemented");
|
||||||
entry.status = ServiceStatus.offline;
|
entry.status = ServiceStatus.offline;
|
||||||
}
|
}
|
||||||
|
found = true;
|
||||||
// cancel the for
|
// cancel the for
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
// If container name is not missing the container is set to offline
|
// If container name is not missing the container is set to offline
|
||||||
else if (entry.docker_container_name !== null) {
|
else {
|
||||||
console.warn("Container for " + entry.name + " could not be found");
|
|
||||||
entry.status = ServiceStatus.offline;
|
entry.status = ServiceStatus.offline;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
if (!found) {
|
||||||
|
console.warn("Container for " + entry.name + " could not be found");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// if name is null do not enter for loop
|
||||||
else {
|
else {
|
||||||
console.error("Container Name not specified");
|
console.error("Container Name not specified");
|
||||||
entry.status = ServiceStatus.error;
|
entry.status = ServiceStatus.error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
// If no Type matches
|
// If no Type matches
|
||||||
else {
|
else {
|
||||||
console.warn("Service Type for Service " + entry.name + " not specified or invalid");
|
console.warn("Service Type for Service " + entry.name + " not specified or invalid");
|
||||||
|
|
Loading…
Reference in a new issue