Skip to content

Commit 1a59f31

Browse files
committed
fix: fixed indirect stack deletion didnt update page and enhance stack deletion logging
1 parent 147601e commit 1a59f31

2 files changed

Lines changed: 23 additions & 5 deletions

File tree

source/compose.manager/php/compose_util_functions.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
function logger($string)
2121
{
2222
$string = escapeshellarg($string);
23-
exec("logger " . $string);
23+
exec("logger -t 'compose.manager' " . $string);
2424
}
2525
}
2626

source/compose.manager/php/exec.php

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,15 @@ function getPostScript(): string {
9595
break;
9696
}
9797
$folderName = "$compose_root/$stackName";
98-
$filesRemain = is_file("$folderName/indirect") ? file_get_contents("$folderName/indirect") : "";
98+
$isIndirect = is_file("$folderName/indirect");
99+
$filesRemain = $isIndirect ? file_get_contents("$folderName/indirect") : "";
99100
exec("rm -rf " . escapeshellarg($folderName));
100-
if (!empty($filesRemain)) {
101-
echo json_encode(['result' => 'warning', 'message' => $filesRemain]);
102-
} else {
101+
if ($filesRemain == "") {
102+
exec("logger -t 'compose.manager' " . escapeshellarg("[stack] Deleted stack: $stackName"));
103103
echo json_encode(['result' => 'success', 'message' => '']);
104+
} else {
105+
exec("logger -t 'compose.manager' " . escapeshellarg("[stack] Deleted stack: $stackName (indirect, external files remain at $filesRemain)"));
106+
echo json_encode(['result' => 'warning', 'message' => $filesRemain]);
104107
}
105108
break;
106109
case 'changeName':
@@ -858,6 +861,12 @@ function getPostScript(): string {
858861
// Check for updates for all compose stacks
859862
require_once("/usr/local/emhttp/plugins/dynamix.docker.manager/include/DockerClient.php");
860863

864+
$cfg = $cfg ?? parse_plugin_cfg($sName);
865+
$debugLog = ($cfg['DEBUG_TO_LOG'] ?? '') === 'true';
866+
if ($debugLog) {
867+
exec("logger -t 'compose.manager' " . escapeshellarg("[update-check] Starting update check for all stacks"));
868+
}
869+
861870
$allUpdates = [];
862871
$DockerUpdate = new DockerUpdate();
863872

@@ -1020,6 +1029,15 @@ function getPostScript(): string {
10201029
}
10211030
file_put_contents($composeUpdateStatusFile, json_encode($savedStatus, JSON_PRETTY_PRINT));
10221031

1032+
if ($debugLog) {
1033+
$totalStacks = count($allUpdates);
1034+
$updatesFound = 0;
1035+
foreach ($allUpdates as $sn => $si) {
1036+
if ($si['hasUpdate']) $updatesFound++;
1037+
}
1038+
exec("logger -t 'compose.manager' " . escapeshellarg("[update-check] Completed: $totalStacks stacks checked, $updatesFound with updates"));
1039+
}
1040+
10231041
echo json_encode(['result' => 'success', 'stacks' => $allUpdates]);
10241042
break;
10251043
case 'getSavedUpdateStatus':

0 commit comments

Comments
 (0)