denozord/cloudflare-domain-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 48 Wiki Activity

refactor: Enhance health check target queries to use FQDN for hostname resolution and improve group health check logic in the database layer
Build, Test, and Push CFDM Docker Image / test (push) Successful in 3m40s
Details
Build, Test, and Push CFDM Docker Image / build-and-push (push) Successful in 1m57s
Details
Build, Test, and Push CFDM Docker Image / update-wiki (push) Successful in 6s
Details
Build, Test, and Push CFDM Docker Image / create-release (push) Has been skipped
Details

Browse Source
This commit is contained in:
Denozordec
2026-06-26 00:46:39 +07:00
parent 6038feda66
commit 09b32a5d62
3 changed files with 40 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/db/dist/index.js
Vendored
+9 -4
View File
@@ -1126,9 +1126,10 @@ function deleteIpHealthStatusForIp(db, scope, refId, ip) {
).run();
}
function listHealthCheckTargets(db) {
const fqdnExpr = sql2`CASE WHEN sb.hostname = '@' OR sb.hostname IS NULL THEN d.zone_name ELSE sb.hostname || '.' || d.zone_name END`;
const bindingTargets = db.all(sql2`
SELECT 'binding' AS scope, sb.id AS ref_id, sbi.ip,
sb.hostname AS hostname,
${fqdnExpr} AS hostname,
sb.health_check_type AS type,
sb.health_check_port AS port,
sb.health_check_path AS path,
@@ -1136,6 +1137,7 @@ function listHealthCheckTargets(db) {
sb.health_check_timeout_ms AS timeout_ms
FROM service_binding_ips sbi
JOIN service_bindings sb ON sb.id = sbi.binding_id
JOIN domains d ON d.id = sb.domain_id
WHERE sb.health_check_enabled = 1
`);
const groupTargets = db.all(sql2`
@@ -1156,7 +1158,7 @@ function listHealthCheckTargets(db) {
`);
const groupInheritedBindingTargets = db.all(sql2`
SELECT 'binding' AS scope, sb.id AS ref_id, sbi.ip,
sb.hostname AS hostname,
${fqdnExpr} AS hostname,
sg.health_check_type AS type,
sg.health_check_port AS port,
sg.health_check_path AS path,
@@ -1164,6 +1166,7 @@ function listHealthCheckTargets(db) {
sg.health_check_timeout_ms AS timeout_ms
FROM service_binding_ips sbi
JOIN service_bindings sb ON sb.id = sbi.binding_id
JOIN domains d ON d.id = sb.domain_id
JOIN services s ON s.id = sb.service_id
JOIN service_groups sg ON sg.id = s.service_group_id
WHERE sg.health_check_enabled = 1
@@ -1174,13 +1177,14 @@ function listHealthCheckTargets(db) {
`);
const cnameBindingTargets = db.all(sql2`
SELECT 'binding' AS scope, sb.id AS ref_id, sb.cname_target AS ip,
sb.hostname AS hostname,
${fqdnExpr} AS hostname,
sb.health_check_type AS type,
sb.health_check_port AS port,
sb.health_check_path AS path,
sb.health_check_expected_status AS expected_status,
sb.health_check_timeout_ms AS timeout_ms
FROM service_bindings sb
JOIN domains d ON d.id = sb.domain_id
JOIN services s ON s.id = sb.service_id
WHERE sb.health_check_enabled = 1
AND sb.cname_target IS NOT NULL
@@ -1189,13 +1193,14 @@ function listHealthCheckTargets(db) {
`);
const groupInheritedCnameBindingTargets = db.all(sql2`
SELECT 'binding' AS scope, sb.id AS ref_id, sb.cname_target AS ip,
sb.hostname AS hostname,
${fqdnExpr} AS hostname,
sg.health_check_type AS type,
sg.health_check_port AS port,
sg.health_check_path AS path,
sg.health_check_expected_status AS expected_status,
sg.health_check_timeout_ms AS timeout_ms
FROM service_bindings sb
JOIN domains d ON d.id = sb.domain_id
JOIN services s ON s.id = sb.service_id
JOIN service_groups sg ON sg.id = s.service_group_id
WHERE sg.health_check_enabled = 1