akanealw/caddy-proxy-manager
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert "Fix Caddy monitoring service detection and error logging"

Browse Source 
This reverts commit 97a9d7947d, reversing
changes made to 88b25cee65.
This commit is contained in:
fuomag9
2025-11-09 21:45:26 +01:00
parent 97a9d7947d
commit 2155aec746
1 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/caddy-monitor.ts
+6 -21
View File
@@ -34,19 +34,12 @@ let isMonitoring = false;
*/
async function getCaddyConfigId(): Promise<string | null> {
try {
// Create abort controller for timeout
const controller = new AbortController();
const timeoutId = setTimeout(() => controller.abort(), 5000);
const response = await fetch(`${config.caddyApiUrl}/config/`, {
method: "GET",
signal: controller.signal
signal: AbortSignal.timeout(5000)
});
clearTimeout(timeoutId);
if (!response.ok) {
console.error(`[CaddyMonitor] Caddy API returned status ${response.status}`);
return null;
}
@@ -63,9 +56,6 @@ async function getCaddyConfigId(): Promise<string | null> {
return isEmpty ? "empty" : "configured";
} catch (error) {
// Network error or timeout
if (error instanceof Error) {
console.error(`[CaddyMonitor] Failed to get Caddy config: ${error.message}`);
}
return null;
}
}
@@ -83,9 +73,9 @@ async function checkCaddyHealth(): Promise<void> {
// Caddy is not responding
monitorState.consecutiveFailures++;
if (monitorState.consecutiveFailures >= MAX_CONSECUTIVE_FAILURES && monitorState.isHealthy) {
if (monitorState.isHealthy && monitorState.consecutiveFailures >= MAX_CONSECUTIVE_FAILURES) {
console.warn(
`[CaddyMonitor] Caddy appears to be down after ${monitorState.consecutiveFailures} consecutive failures`
`[CaddyMonitor] Caddy appears to be down (${monitorState.consecutiveFailures} consecutive failures)`
);
monitorState.isHealthy = false;
}
@@ -95,20 +85,15 @@ async function checkCaddyHealth(): Promise<void> {
// Caddy is responding
const wasUnhealthy = !monitorState.isHealthy;
monitorState.consecutiveFailures = 0;
if (wasUnhealthy) {
console.log("[CaddyMonitor] Caddy is now responding again");
}
monitorState.isHealthy = true;
// Detect restart: config ID changed to "empty" or Caddy was previously unhealthy and now has empty config
// Detect restart: config ID changed to "empty" or Caddy was previously unhealthy
const hasRestarted =
(monitorState.lastConfigId !== null && currentConfigId === "empty") ||
(wasUnhealthy && currentConfigId === "empty");
if (hasRestarted) {
console.log("[CaddyMonitor] Caddy restart detected (config is empty)! Waiting before reapplying configuration...");
console.log("[CaddyMonitor] Caddy restart detected! Waiting before reapplying configuration...");
// Wait a bit for Caddy to fully initialize
setTimeout(async () => {
@@ -127,7 +112,7 @@ async function checkCaddyHealth(): Promise<void> {
}, REAPPLY_DELAY);
} else if (monitorState.lastConfigId === null) {
// First time seeing Caddy healthy
console.log(`[CaddyMonitor] Caddy health monitoring initialized (current state: ${currentConfigId})`);
console.log("[CaddyMonitor] Caddy health monitoring initialized");
monitorState.lastConfigId = currentConfigId;
} else {
// Normal operation, update last known config ID