diff --git a/src/services.js b/src/services.js index a5e271677..7f40bb1a7 100644 --- a/src/services.js +++ b/src/services.js @@ -300,11 +300,12 @@ async function containerStatus(containerName, tokenEnvName) { if (response.status !== 200 || !response.body.status) return { status: exports.SERVICE_STATUS_STARTING, error: `Error waiting for ${containerName}. Status code: ${response.statusCode} message: ${response.body.message}` }; const result = await docker.memoryUsage(containerName); + const stats = result.memory_stats || { usage: 0, limit: 1 }; return { status: addonDetails.state.Running ? exports.SERVICE_STATUS_ACTIVE : exports.SERVICE_STATUS_STOPPED, - memoryUsed: result.memory_stats.usage, - memoryPercent: parseInt(100 * result.memory_stats.usage / result.memory_stats.limit), + memoryUsed: stats.usage, + memoryPercent: parseInt(100 * stats.usage / stats.limit), healthcheck: response.body }; } @@ -1822,11 +1823,12 @@ async function statusTurn() { const status = container.State.Running ? (container.HostConfig.ReadonlyRootfs ? exports.SERVICE_STATUS_ACTIVE : exports.SERVICE_STATUS_STARTING) : exports.SERVICE_STATUS_STOPPED; + const stats = result.memory_stats || { usage: 0, limit: 1 }; return { status, - memoryUsed: result.memory_stats.usage, - memoryPercent: parseInt(100 * result.memory_stats.usage / result.memory_stats.limit) + memoryUsed: stats.usage, + memoryPercent: parseInt(100 * stats.usage / stats.limit) }; } @@ -1876,11 +1878,12 @@ async function statusGraphite() { if (response.status !== 200) return { status: exports.SERVICE_STATUS_STARTING, error: `Error waiting for graphite. Status code: ${response.status} message: ${response.body.message}` }; const result = await docker.memoryUsage('graphite'); + const stats = result.memory_stats || { usage: 0, limit: 1 }; return { status: container.State.Running ? exports.SERVICE_STATUS_ACTIVE : exports.SERVICE_STATUS_STOPPED, - memoryUsed: result.memory_stats.usage, - memoryPercent: parseInt(100 * result.memory_stats.usage / result.memory_stats.limit) + memoryUsed: stats.usage, + memoryPercent: parseInt(100 * stats.usage / stats.limit) }; } diff --git a/src/sftp.js b/src/sftp.js index 97718d597..e4e94abb3 100644 --- a/src/sftp.js +++ b/src/sftp.js @@ -133,9 +133,11 @@ async function status() { ? (container.HostConfig.ReadonlyRootfs ? services.SERVICE_STATUS_ACTIVE : services.SERVICE_STATUS_STARTING) : services.SERVICE_STATUS_STOPPED; + const stats = result.memory_stats || { usage: 0, limit: 1 }; + return { status, - memoryUsed: result.memory_stats.usage, - memoryPercent: parseInt(100 * result.memory_stats.usage / result.memory_stats.limit) + memoryUsed: stats.usage, + memoryPercent: parseInt(100 * stats.usage / stats.limit) }; }