check caddy admin before deploy, not just on page load
This commit is contained in:
1 parent
febe18b431
commit
4af62acfc1
1 file changed
+14
-1
+14
-1
@@ -97,7 +97,9 @@ if (isset($_GET['action'])) {
|
|||||||
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
$code = curl_getinfo($ch, CURLINFO_HTTP_CODE);
|
||||||
$err = curl_error($ch);
|
$err = curl_error($ch);
|
||||||
curl_close($ch);
|
curl_close($ch);
|
||||||
echo json_encode(['ok' => !$err && $code > 0]);
|
if ($err) { echo json_encode(['ok' => false, 'error' => $err]); exit; }
|
||||||
|
if (!$code) { echo json_encode(['ok' => false, 'error' => 'No response from Caddy admin API']); exit; }
|
||||||
|
echo json_encode(['ok' => true]);
|
||||||
exit;
|
exit;
|
||||||
|
|
||||||
case 'load':
|
case 'load':
|
||||||
@@ -541,6 +543,17 @@ async function doDeploy() {
|
|||||||
setDeployBtn(true, 'Deploying…');
|
setDeployBtn(true, 'Deploying…');
|
||||||
setStatus('Deploying…', '');
|
setStatus('Deploying…', '');
|
||||||
|
|
||||||
|
try {
|
||||||
|
const r = await fetch('?action=check_admin');
|
||||||
|
const d = await r.json();
|
||||||
|
if (!d.ok) {
|
||||||
|
setStatus('Caddy admin API unreachable', 'warn');
|
||||||
|
toast(d.error || 'Caddy admin API is not reachable', 'error');
|
||||||
|
setDeployBtn(false, 'Deploy');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} catch (e) { /* proceed anyway */ }
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const payload = {
|
const payload = {
|
||||||
global: document.getElementById('global-editor').value,
|
global: document.getElementById('global-editor').value,
|
||||||
|
|||||||
Reference in new issue
Block a user