scottk/ols-ucentral-schema
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/ols-ucentral-schema.git synced 2025-10-31 18:17:45 +00:00
Code Issues Packages Projects Releases 3 Wiki Activity

schema: fix log generation

Browse Source 
Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2021-06-01 13:00:27 +02:00
parent ba86a149b8
commit f7c2d39c98
1 changed files with 23 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
renderer/ucentral.uc
View File

@@ -17,33 +17,38 @@ inputfile.close();
let logs = []; let logs = [];
try { try {
let batch = renderer.render(schemareader.validate(inputjson), logs); let state = schemareader.validate(inputjson, logs);
let batch = state ? renderer.render(state, logs) : "";
fs.stdout.write("Log messages:\n" + join("\n", logs) + "\n\n"); fs.stdout.write("Log messages:\n" + join("\n", logs) + "\n\n");
fs.stdout.write("UCI batch output:\n" + batch + "\n"); fs.stdout.write("UCI batch output:\n" + batch + "\n");
let outputjson = fs.open("/tmp/ucentral.uci", "w"); if (state) {
outputjson.write(batch); let outputjson = fs.open("/tmp/ucentral.uci", "w");
outputjson.close(); outputjson.write(batch);
outputjson.close();
for (let cmd in [ 'rm -rf /tmp/config-shadow', for (let cmd in [ 'rm -rf /tmp/config-shadow',
'cp -r /etc/config-shadow /tmp' ]) 'cp -r /etc/config-shadow /tmp' ])
system(cmd); system(cmd);
let apply = fs.popen("/sbin/uci -c /tmp/config-shadow batch", "w"); let apply = fs.popen("/sbin/uci -c /tmp/config-shadow batch", "w");
apply.write(batch); apply.write(batch);
apply.close(); apply.close();
for (let cmd in [ 'uci -c /tmp/config-shadow commit', for (let cmd in [ 'uci -c /tmp/config-shadow commit',
'cp /tmp/config-shadow/* /etc/config/', 'cp /tmp/config-shadow/* /etc/config/',
'rm -rf /tmp/config-shadow', 'rm -rf /tmp/config-shadow',
'reload_config']) 'reload_config'])
system(cmd); system(cmd);
fs.unlink('/etc/ucentral/ucentral.active');
fs.symlink(ARGV[2], '/etc/ucentral/ucentral.active');
fs.unlink('/etc/ucentral/ucentral.active');
fs.symlink(ARGV[2], '/etc/ucentral/ucentral.active');
} else {
error = 1;
}
} }
catch (e) { catch (e) {
error = 1; error = 1;