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

v6.1.2.0 

Change log: https://roxy-wi.org/changelog.py#6_1_2
pull/334/head
Pavel Loginov 2022-07-25 10:12:47 +03:00
parent bb6d6c18f7
commit f8ffdb1ef6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/funct.py
View File

@ -1265,7 +1265,7 @@ def show_finding_in_config(stdout: str, **kwargs) -> str:
def show_haproxy_log(serv, rows=10, waf='0', grep=None, hour='00', minut='00', hour1='24', minut1='00', service='haproxy', **kwargs): def show_haproxy_log(serv, rows=10, waf='0', grep=None, hour='00', minut='00', hour1='24', minut1='00', service='haproxy', **kwargs):
import sql import sql
exgrep = form.getvalue('exgrep') exgrep = form.getvalue('exgrep')
log_file = checkAjaxInput(form.getvalue('file')) log_file = form.getvalue('file')
date = checkAjaxInput(hour) + ':' + checkAjaxInput(minut) date = checkAjaxInput(hour) + ':' + checkAjaxInput(minut)
date1 = checkAjaxInput(hour1) + ':' + checkAjaxInput(minut1) date1 = checkAjaxInput(hour1) + ':' + checkAjaxInput(minut1)
rows = checkAjaxInput(rows) rows = checkAjaxInput(rows)
@ -1282,6 +1282,8 @@ def show_haproxy_log(serv, rows=10, waf='0', grep=None, hour='00', minut='00', h
else: else:
exgrep_act = '' exgrep_act = ''
log_file = checkAjaxInput(log_file) if log_file is not None else log_file
if service in ('nginx', 'haproxy', 'apache', 'keepalived'): if service in ('nginx', 'haproxy', 'apache', 'keepalived'):
syslog_server_enable = sql.get_setting('syslog_server_enable') syslog_server_enable = sql.get_setting('syslog_server_enable')
if syslog_server_enable is None or syslog_server_enable == 0: if syslog_server_enable is None or syslog_server_enable == 0:

2
inc/add.js
View File

@ -881,7 +881,7 @@ $( function() {
$( "#path-cert-listen" ).autocomplete({ $( "#path-cert-listen" ).autocomplete({
source: function( request, response ) { source: function( request, response ) {
if(!checkIsServerFiled('#serv2')) return false; if(!checkIsServerFiled('#serv')) return false;
$.ajax( { $.ajax( {
url: "options.py", url: "options.py",
data: { data: {