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

v3.2.13 

bugs
pull/74/head
Aidaho12 2018-11-02 15:28:06 +06:00
parent 89f67ae01d
commit 242152f17c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/funct.py
View File

@ -350,7 +350,7 @@ def upload_and_restart(serv, cfg, **kwargs):
error += str(upload(serv, tmp_file, cfg, dir='fullpath')) error += str(upload(serv, tmp_file, cfg, dir='fullpath'))
try: try:
error += ssh_command(serv, commands, retunr_err=1) error += ssh_command(serv, commands)
except Exception as e: except Exception as e:
error += e error += e
if error: if error:
@ -427,7 +427,7 @@ def ssh_command(serv, commands, **kwargs):
elif kwargs.get('print_out'): elif kwargs.get('print_out'):
print(stdout.read().decode(encoding='UTF-8')) print(stdout.read().decode(encoding='UTF-8'))
return stdout.read().decode(encoding='UTF-8') return stdout.read().decode(encoding='UTF-8')
elif kwargs.get('retunr_err'): elif kwargs.get('retunr_err') == 1:
return stderr.read().decode(encoding='UTF-8') return stderr.read().decode(encoding='UTF-8')
else: else:
return stdout.read().decode(encoding='UTF-8') return stdout.read().decode(encoding='UTF-8')