zydronium/getnamingo-registry
1
0
Fork 0
mirror of https://github.com/getnamingo/registry.git synced 2025-07-12 13:58:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Improved zone generator error reporting and logging

Browse source
This commit is contained in:
Pinga 2024-11-01 19:18:20 +02:00
parent ff871dd4ae
commit 9bde05c4a5
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
automation/write-zone.php
View file

@ -164,57 +164,57 @@ Coroutine::create(function () use ($pool, $log, $c) {
foreach ($tlds as $cleanedTld) { foreach ($tlds as $cleanedTld) {
if ($c['dns_server'] == 'bind') { if ($c['dns_server'] == 'bind') {
exec("rndc reload {$cleanedTld}.", $output, $return_var); exec("rndc reload {$cleanedTld}. 2>&1", $output, $return_var);
if ($return_var != 0) { if ($return_var != 0) {
$log->error('Failed to reload BIND. ' . $return_var); $log->error("Failed to reload BIND for {$cleanedTld}. Output: " . implode(" ", $output) . " Code: " . $return_var);
} }
exec("rndc notify {$cleanedTld}.", $output, $return_var); exec("rndc notify {$cleanedTld}. 2>&1", $output, $return_var);
if ($return_var != 0) { if ($return_var != 0) {
$log->error('Failed to notify secondary servers. ' . $return_var); $log->error("Failed to notify secondary servers for {$cleanedTld}. Output: " . implode(" ", $output) . " Code: " . $return_var);
} }
} elseif ($c['dns_server'] == 'nsd') { } elseif ($c['dns_server'] == 'nsd') {
exec("nsd-control reload", $output, $return_var); exec("nsd-control reload 2>&1", $output, $return_var);
if ($return_var != 0) { if ($return_var != 0) {
$log->error('Failed to reload NSD. ' . $return_var); $log->error("Failed to reload NSD. Output: " . implode(" ", $output) . " Code: " . $return_var);
} }
} elseif ($c['dns_server'] == 'knot') { } elseif ($c['dns_server'] == 'knot') {
exec("knotc reload", $output, $return_var); exec("knotc reload 2>&1", $output, $return_var);
if ($return_var != 0) { if ($return_var != 0) {
$log->error('Failed to reload Knot DNS. ' . $return_var); $log->error("Failed to reload Knot DNS. Output: " . implode(" ", $output) . " Code: " . $return_var);
} }
exec("knotc zone-notify {$cleanedTld}.", $output, $return_var); exec("knotc zone-notify {$cleanedTld}. 2>&1", $output, $return_var);
if ($return_var != 0) { if ($return_var != 0) {
$log->error('Failed to notify secondary servers. ' . $return_var); $log->error("Failed to notify secondary servers for {$cleanedTld}. Output: " . implode(" ", $output) . " Code: " . $return_var);
} }
} elseif ($c['dns_server'] == 'opendnssec') { } elseif ($c['dns_server'] == 'opendnssec') {
chown("{$basePath}/{$cleanedTld}.zone", 'opendnssec'); chown("{$basePath}/{$cleanedTld}.zone", 'opendnssec');
chgrp("{$basePath}/{$cleanedTld}.zone", 'opendnssec'); chgrp("{$basePath}/{$cleanedTld}.zone", 'opendnssec');
exec("ods-signer sign {$cleanedTld}"); exec("ods-signer sign {$cleanedTld} 2>&1");
sleep(1); sleep(1);
copy("/var/lib/opendnssec/signed/{$cleanedTld}", "/var/lib/bind/{$cleanedTld}.zone.signed"); copy("/var/lib/opendnssec/signed/{$cleanedTld}", "/var/lib/bind/{$cleanedTld}.zone.signed");
exec("rndc reload {$cleanedTld}.", $output, $return_var); exec("rndc reload {$cleanedTld}. 2>&1", $output, $return_var);
if ($return_var != 0) { if ($return_var != 0) {
$log->error('Failed to reload BIND. ' . $return_var); $log->error("Failed to reload BIND for {$cleanedTld}. Output: " . implode(" ", $output) . " Code: " . $return_var);
} }
exec("rndc notify {$cleanedTld}.", $output, $return_var); exec("rndc notify {$cleanedTld}. 2>&1", $output, $return_var);
if ($return_var != 0) { if ($return_var != 0) {
$log->error('Failed to notify secondary servers. ' . $return_var); $log->error("Failed to notify secondary servers for {$cleanedTld}. Output: " . implode(" ", $output) . " Code: " . $return_var);
} }
} else { } else {
// Default // Default
exec("rndc reload {$cleanedTld}.", $output, $return_var); exec("rndc reload {$cleanedTld}. 2>&1", $output, $return_var);
if ($return_var != 0) { if ($return_var != 0) {
$log->error('Failed to reload BIND. ' . $return_var); $log->error("Failed to reload BIND for {$cleanedTld}. Output: " . implode(" ", $output) . " Code: " . $return_var);
} }
exec("rndc notify {$cleanedTld}.", $output, $return_var); exec("rndc notify {$cleanedTld}. 2>&1", $output, $return_var);
if ($return_var != 0) { if ($return_var != 0) {
$log->error('Failed to notify secondary servers. ' . $return_var); $log->error("Failed to notify secondary servers for {$cleanedTld}. Output: " . implode(" ", $output) . " Code: " . $return_var);
} }
} }
} }