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

v3.1

pull/42/head
Aidaho12 2018-08-17 23:08:07 +06:00
parent f4ed036a44
commit 7d6ca27c86
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/add.py
View File

@ -169,7 +169,7 @@ if form.getvalue('mode') is not None:
waf = ""
if form.getvalue('waf') is not None:
waf = " filter spoe engine modsecurity config "+haproxy_dir+"/spoe-modsecurity.conf\n"
waf = " filter spoe engine modsecurity config "+haproxy_dir+"/waf.conf\n"
waf += " http-request deny if { var(txn.modsec.code) -m int gt 0 }\n"
config_add = name + "\n" + bind + mode + "\n" + balance + options_split + filter + compression_s + cache_s + waf + backend + servers_split + "\n" + cache_set

2
app/overview.py
View File

@ -26,7 +26,7 @@ try:
checker_worker, stderr = funct.subprocess_execute(cmd)
cmd = "ps ax |grep metrics_master |grep -v grep |wc -l"
metrics_master, stderr = funct.subprocess_execute(cmd)
cmd = "ps ax |grep metrics_worker |grep -v grep |wc -l"
cmd = "ps ax |grep -e 'metrics_worker\|metrics_waf_worker.py' |grep -v grep |wc -l"
metrics_worker, stderr = funct.subprocess_execute(cmd)
except:
pass

2
app/tools/metrics_master.py
View File

@ -52,7 +52,7 @@ def kill_worker(serv):
funct.logging("localhost", stderr, metrics=1)
def kill_all_workers():
cmd = "ps ax |grep 'tools/metrics_worker.py' |grep -v grep |awk '{print $1}' |xargs kill"
cmd = "ps ax |grep -e 'tools/metrics_worker.py\|tools/metrics_waf_worker.py' |grep -v grep |awk '{print $1}' |xargs kill"
output, stderr = funct.subprocess_execute(cmd)
funct.logging("localhost", " Masrer killing all metrics workers", metrics=1)
if stderr:

4
app/tools/metrics_worker.py
View File

@ -21,10 +21,8 @@ class GracefulKiller:
def main(serv, port):
port = str(port)
firstrun = True
currentstat = []
readstats = ""
killer = GracefulKiller()
old_stat_service = ""
while True:
try:
@ -49,7 +47,7 @@ def main(serv, port):
break
if __name__ == "__main__":
parser = argparse.ArgumentParser(description='Metrics HAProxy service.', prog='check_haproxy.py', formatter_class=argparse.ArgumentDefaultsHelpFormatter)
parser = argparse.ArgumentParser(description='Metrics HAProxy service.', prog='metrics_worker.py', formatter_class=argparse.ArgumentDefaultsHelpFormatter)
parser.add_argument('IP', help='Start get metrics from HAProxy service at this ip', nargs='?', type=str)
parser.add_argument('--port', help='Start get metrics from HAProxy service at this port', nargs='?', default=1999, type=int)