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

v6.2.0.0 

Changelog: https://roxy-wi.org/changelog#6_2_0
pull/343/head
Pavel Loginov 2022-09-26 16:53:08 +03:00
parent 13be24f00f
commit e4d7640b2c
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/funct.py
View File

@ -122,7 +122,7 @@ def logging(server_ip: str, action: str, **kwargs) -> None:
login = '' login = ''
cur_date = get_data('logs') cur_date = get_data('logs')
cur_date_in_log = get_data('date_in_log') cur_date_in_log = get_data('date_in_log')
log_path = ('main', 'log_path') log_path = get_config_var.get_config_var('main', 'log_path')
if not os.path.exists(log_path): if not os.path.exists(log_path):
os.makedirs(log_path) os.makedirs(log_path)
@ -344,7 +344,7 @@ def page_for_admin(level=1) -> None:
def return_ssh_keys_path(server_ip: str, **kwargs): def return_ssh_keys_path(server_ip: str, **kwargs):
import sql import sql
lib_path= get_config_var.get_config_var('main', 'lib_path') lib_path = get_config_var.get_config_var('main', 'lib_path')
ssh_enable = '' ssh_enable = ''
ssh_user_name = '' ssh_user_name = ''
ssh_user_password = '' ssh_user_password = ''
@ -412,7 +412,7 @@ def get_config(server_ip, cfg, **kwargs):
def diff_config(oldcfg, cfg, **kwargs): def diff_config(oldcfg, cfg, **kwargs):
import sql import sql
cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE")) cookie = http.cookies.SimpleCookie(os.environ.get("HTTP_COOKIE"))
log_path= get_config_var.get_config_var('main', 'log_path') log_path = get_config_var.get_config_var('main', 'log_path')
user_group = get_user_group() user_group = get_user_group()
diff = "" diff = ""
date = get_data('date_in_log') date = get_data('date_in_log')
@ -550,7 +550,7 @@ def get_userlists(config):
def get_backends_from_config(server_ip, backends=''): def get_backends_from_config(server_ip, backends=''):
configs_dir= get_config_var.get_config_var('configs', 'haproxy_save_configs_dir') configs_dir = get_config_var.get_config_var('configs', 'haproxy_save_configs_dir')
format_cfg = 'cfg' format_cfg = 'cfg'
try: try:
@ -1268,7 +1268,7 @@ def show_roxy_log(
return show_log(output, grep=grep) return show_log(output, grep=grep)
elif service == 'internal': elif service == 'internal':
log_path= get_config_var.get_config_var('main', 'log_path') log_path = get_config_var.get_config_var('main', 'log_path')
logs_files = get_files(log_path, "log") logs_files = get_files(log_path, "log")
user_group = get_user_group() user_group = get_user_group()
user_grep = '' user_grep = ''

1
app/modules/roxy_wi_tools.py
View File

@ -1,5 +1,6 @@
from configparser import ConfigParser, ExtendedInterpolation from configparser import ConfigParser, ExtendedInterpolation
class GetConfigVar: class GetConfigVar:
def __init__(self): def __init__(self):
self.path_config = "/etc/roxy-wi/roxy-wi.cfg" self.path_config = "/etc/roxy-wi/roxy-wi.cfg"