jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

docker: rename function

Browse Source
This commit is contained in:
Girish Ramakrishnan
2025-05-21 15:37:31 +02:00
parent f53180a960
commit 3770f07720
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/docker.js
View File

@@ -18,7 +18,7 @@ exports = module.exports = {
inspect,
getContainerIp,
getEvents,
memoryUsage,
stats,
update,
@@ -537,7 +537,7 @@ async function deleteContainers(appId, options) {
const labels = [ 'appId=' + appId ];
if (options.managedOnly) labels.push('isCloudronManaged=true');
const [error, containers] = await safe(gConnection.listContainers({ all: 1, filters: JSON.stringify({ label: labels }) }));
const [error, containers] = await safe(gConnection.listContainers({ all: options.all, filters: JSON.stringify({ label: labels }) }));
if (error) throw new BoxError(BoxError.DOCKER_ERROR, error);
for (const container of containers) {
@@ -660,7 +660,7 @@ async function getEvents(options) {
return stream;
}
async function memoryUsage(containerId) {
async function stats(containerId) {
assert.strictEqual(typeof containerId, 'string');
const container = gConnection.getContainer(containerId);

6
src/services.js
View File

@@ -339,7 +339,7 @@ async function containerStatus(containerName) {
if (networkError) return { status: exports.SERVICE_STATUS_STARTING, error: `Error waiting for ${containerName}: ${networkError.message}` };
if (response.status !== 200 || !response.body.status) return { status: exports.SERVICE_STATUS_STARTING, error: `Error waiting for ${containerName}. Status code: ${response.status} message: ${response.body.message}` };
const result = await docker.memoryUsage(containerName);
const result = await docker.stats(containerName);
const stats = result.memory_stats || { usage: 0, limit: 1 };
return {
@@ -2037,7 +2037,7 @@ async function statusTurn() {
if (error && error.reason === BoxError.NOT_FOUND) return { status: exports.SERVICE_STATUS_STOPPED };
if (error) throw error;
const result = await docker.memoryUsage(container.Id);
const result = await docker.stats(container.Id);
const status = container.State.Running
? (container.HostConfig.ReadonlyRootfs ? exports.SERVICE_STATUS_ACTIVE : exports.SERVICE_STATUS_STARTING)
@@ -2102,7 +2102,7 @@ async function statusGraphite() {
if (networkError) return { status: exports.SERVICE_STATUS_STARTING, error: `Error waiting for graphite: ${networkError.message}` };
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 result = await docker.stats('graphite');
const stats = result.memory_stats || { usage: 0, limit: 1 };
return {