github
/
haproxy-wi
mirror of https://github.com/Aidaho12/haproxy-wi
1
0
Fork 0
Code Issues Releases Wiki Activity

v8.0.1: Refactor variable types and names for clarity 

Updated variable types from `var` to `let` in script.js for block scope. Renamed `file_name` to `file_path` for consistency across templates and models. Added additional error conditions for alert handling in the JavaScript code.
pull/399/head
Aidaho 2024-09-09 09:52:33 +03:00
parent 2b96fefba1
commit 1f9942aa7d
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/modules/roxywi/class_models.py
View File

@ -192,7 +192,7 @@ class VersionsForDelete(BaseModel):
class ConfigRequest(BaseModel): class ConfigRequest(BaseModel):
action: Literal['save', 'test', 'reload', 'restart'] action: Literal['save', 'test', 'reload', 'restart']
file_name: Optional[str] = None file_path: Optional[str] = None
config_local_path: Optional[str] = None config_local_path: Optional[str] = None
config: str config: str

25
app/static/js/script.js
View File

@ -1102,17 +1102,17 @@ function returnNiceCheckingConfig(data) {
data = data.replaceAll('nginx: the configuration file /etc/nginx/nginx.conf syntax is ok', ''); data = data.replaceAll('nginx: the configuration file /etc/nginx/nginx.conf syntax is ok', '');
data = data.replaceAll('nginx: configuration file /etc/nginx/nginx.conf test is successful', ''); data = data.replaceAll('nginx: configuration file /etc/nginx/nginx.conf test is successful', '');
data = data.replaceAll('Syntax OK', ''); data = data.replaceAll('Syntax OK', '');
output = data.split('<br>') let output = data.split('<br>')
var alerts = []; let alerts = [];
var alert_warning = ''; let alert_warning = '';
var alert_warning2 = ''; let alert_warning2 = '';
var alert_error = ''; let alert_error = '';
var second_alert = false; let second_alert = false;
alerts.push(output[0] + '\n' + output[1]); alerts.push(output[0] + '\n' + output[1]);
var server_name = output[0]; let server_name = output[0];
var server_name2 = ''; let server_name2 = '';
try { try {
for (var i = 0; i < output.length; i++) { for (let i = 0; i < output.length; i++) {
if (i > 1) { if (i > 1) {
if (output[i] !== undefined) { if (output[i] !== undefined) {
alerts.push(output[i]) alerts.push(output[i])
@ -1123,13 +1123,16 @@ function returnNiceCheckingConfig(data) {
console.log(err); console.log(err);
} }
alerts.forEach((element) => { alerts.forEach((element) => {
if (element.indexOf('error: ') != '-1' || element.indexOf('Fatal') != '-1' || element.indexOf('Error') != '-1' || element.indexOf('failed ') != '-1' || element.indexOf('emerg] ') != '-1' || element.indexOf('Syntax error ') != '-1' || element.indexOf('Parsing') != '-1' || element.indexOf('Unknown') != '-1') { if (element.indexOf('error: ') != '-1' || element.indexOf('Fatal') != '-1' || element.indexOf('Error') != '-1'
|| element.indexOf('failed ') != '-1' || element.indexOf('emerg] ') != '-1' || element.indexOf('Syntax error ') != '-1'
|| element.indexOf('Parsing') != '-1' || element.indexOf('Unknown') != '-1' || element.indexOf('Unexpected') != '-1'
|| element.indexOf('unknown') != '-1') {
alert_error = alert_error + element; alert_error = alert_error + element;
return return
} }
if (element.indexOf('[WARNING]') != '-1' || element.indexOf('[ALER]') != '-1' || element.indexOf('[warn]') != '-1') { if (element.indexOf('[WARNING]') != '-1' || element.indexOf('[ALER]') != '-1' || element.indexOf('[warn]') != '-1') {
element = removeEmptyLines(element); element = removeEmptyLines(element);
if (second_alert == false) { if (second_alert === false) {
alert_warning = alert_warning + element; alert_warning = alert_warning + element;
} else { } else {
alert_warning2 = alert_warning2 + element; alert_warning2 = alert_warning2 + element;

2
app/templates/config.html
View File

@ -68,7 +68,7 @@
<form action="/config/{{service}}/{{serv}}" name="saveconfig" id="saveconfig" method="post" class="left-space"> <form action="/config/{{service}}/{{serv}}" name="saveconfig" id="saveconfig" method="post" class="left-space">
<input type="hidden" value="{{ cfg }}.old" name="config_local_path"> <input type="hidden" value="{{ cfg }}.old" name="config_local_path">
<input type="hidden" value="{{ service }}" name="service"> <input type="hidden" value="{{ service }}" name="service">
<input type="hidden" value="{{ config_file_name }}" name="file_name"> <input type="hidden" value="{{ config_file_name }}" name="file_path">
<div> <div>
<textarea name="config" id="config_text_area" class="config" rows="35" cols="100">{{ config }}</textarea> <textarea name="config" id="config_text_area" class="config" rows="35" cols="100">{{ config }}</textarea>
</div> </div>