tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor changes in transfer (retry)

This commit is contained in:
alejandro 2023-08-17 12:45:09 +02:00
parent 1c0497289e
commit f55efbee7f
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
pandora_server/extras/pandoraPlugintools/transfer.py
View File

@ -126,52 +126,49 @@ def tentacle_xml(
tentacle_cmd = f"{tentacle_path} -v -a {tentacle_ops['address']} -p {tentacle_ops['port']} {tentacle_ops['extra_opts']} {data_file.strip()}" tentacle_cmd = f"{tentacle_path} -v -a {tentacle_ops['address']} -p {tentacle_ops['port']} {tentacle_ops['extra_opts']} {data_file.strip()}"
tentacle_exe=subprocess.Popen(tentacle_cmd, stdout=subprocess.PIPE,stderr=subprocess.PIPE, shell=True) tentacle_exe=subprocess.Popen(tentacle_cmd, stdout=subprocess.PIPE,stderr=subprocess.PIPE, shell=True)
rc=tentacle_exe.wait() rc=tentacle_exe.wait()
if debug == 0 :
os.remove(data_file.strip())
result = True
if rc != 0 : if rc != 0 :
if retry: if retry:
if _GLOBAL_VARIABLES['tentacle_retries'] > 1: tentacle_retries = _GLOBAL_VARIABLES['tentacle_retries']
_GLOBAL_VARIABLES['tentacle_retries'] = 1
if tentacle_retries < 1:
tentacle_retries = 1
retry_count = 0 retry_count = 0
while retry_count < _GLOBAL_VARIABLES['tentacle_retries'] : while retry_count < tentacle_retries :
tentacle_exe=subprocess.Popen(tentacle_cmd, stdout=subprocess.PIPE,stderr=subprocess.PIPE, shell=True) tentacle_exe=subprocess.Popen(tentacle_cmd, stdout=subprocess.PIPE,stderr=subprocess.PIPE, shell=True)
rc=tentacle_exe.wait() rc=tentacle_exe.wait()
if debug == 0 :
os.remove(data_file.strip())
if rc == 0: if rc == 0:
break break
if print_errors: if print_errors:
stderr = tentacle_exe.stderr.read().decode() stderr = tentacle_exe.stderr.read().decode()
msg = f"Tentacle error (Retry {retry_count + 1}/{_GLOBAL_VARIABLES['tentacle_retries']}): {stderr}" msg = f"Tentacle error (Retry {retry_count + 1}/{tentacle_retries}): {stderr}"
print_stderr(str(datetime.today().strftime('%Y-%m-%d %H:%M')) + msg) print_stderr(str(datetime.today().strftime('%Y-%m-%d %H:%M')) + msg)
retry_count += 1 retry_count += 1
if retry_count >= _GLOBAL_VARIABLES['tentacle_retries']: if retry_count >= tentacle_retries:
if print_errors: result = False
stderr = tentacle_exe.stderr.read().decode()
msg = f"Tentacle error (Final Retry): {stderr}"
print_stderr(str(datetime.today().strftime('%Y-%m-%d %H:%M')) + msg)
return False
else: else:
if print_errors: if print_errors:
stderr = tentacle_exe.stderr.read().decode() stderr = tentacle_exe.stderr.read().decode()
msg="Tentacle error:" + str(stderr) msg="Tentacle error:" + str(stderr)
print_stderr(str(datetime.today().strftime('%Y-%m-%d %H:%M')) + msg) print_stderr(str(datetime.today().strftime('%Y-%m-%d %H:%M')) + msg)
return False result = False
if debug == 0 :
os.remove(data_file.strip())
return result
else: else:
if print_errors: if print_errors: