netravnen/dn42-roagen
1
0
Fork 0
Code Releases Activity

Move JSON encoding of array() to _functions lib

Browse source
This commit is contained in:
netravnen 2018-12-18 13:21:26 +00:00
parent 6f08a272fd
commit 690d942fc8
3 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
_functions.php
View file

@ -75,8 +75,10 @@ function commitPushToRemotes ()
echo shell_exec ("./update.sh 2>&1"); echo shell_exec ("./update.sh 2>&1");
} }
function writeBirdConfig ($json, $roas) function writeBirdConfig ($roas)
{ {
$json = json_encode($roas, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
$fq = fopen ('roa/bird_roa_dn42.conf', 'w'); $fq = fopen ('roa/bird_roa_dn42.conf', 'w');
$fq4 = fopen ('roa/bird4_roa_dn42.conf', 'w'); $fq4 = fopen ('roa/bird4_roa_dn42.conf', 'w');
$fq6 = fopen ('roa/bird6_roa_dn42.conf', 'w'); $fq6 = fopen ('roa/bird6_roa_dn42.conf', 'w');
@ -106,8 +108,10 @@ function writeBirdConfig ($json, $roas)
fclose ($fq6); fclose ($fq6);
} }
function writeRoutinatorExceptionFile ($json) function writeRoutinatorExceptionFile ($roas)
{ {
$json = json_encode($roas, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK);
$fp = fopen('roa/export_rfc8416_dn42.json', 'w'); $fp = fopen('roa/export_rfc8416_dn42.json', 'w');
fwrite($fp, $json); fwrite($fp, $json);
@ -115,8 +119,10 @@ function writeRoutinatorExceptionFile ($json)
fclose($fp); fclose($fp);
} }
function writeExportJSON ($json) function writeExportJSON ($roas)
{ {
$json = json_encode($roas, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT);
$fp = fopen ('roa/export_dn42.json', 'w'); $fp = fopen ('roa/export_dn42.json', 'w');
fwrite ($fp, shell_exec ("/usr/bin/git -C ../registry/ show | sed 's/^/\/\/ /g'")); fwrite ($fp, shell_exec ("/usr/bin/git -C ../registry/ show | sed 's/^/\/\/ /g'"));

5
rfc8416.php
View file

@ -214,10 +214,7 @@ foreach ($raw_array as $sub_array)
} }
} }
// Do JSON encoding before writing result to file writeRoutinatorExceptionFile($roas);
$json = json_encode($roas, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT|JSON_NUMERIC_CHECK);
writeRoutinatorExceptionFile($json);
commitPushToRemotes(); commitPushToRemotes();

7
roagen.php
View file

@ -189,11 +189,8 @@ foreach ($raw_array as $sub_array)
} }
} }
// Do JSON encoding before writing result to file writeExportJSON($roas);
$json = json_encode ($roas, JSON_UNESCAPED_SLASHES|JSON_PRETTY_PRINT); writeBirdConfig($roas);
writeExportJSON($json);
writeBirdConfig($json, $roas);
commitPushToRemotes(); commitPushToRemotes();