Merge branch 'master' into latest

latest v1.1.3
Nguyen Huu Thuong 5 years ago
commit 6582a0be19

@ -60,8 +60,14 @@ def connect(callback=None):
ssh.connect(INPUT_HOST, port=INPUT_PORT, username=INPUT_USER, ssh.connect(INPUT_HOST, port=INPUT_PORT, username=INPUT_USER,
pkey=p_key, password=INPUT_PASS, pkey=p_key, password=INPUT_PASS,
timeout=convert_to_seconds(INPUT_CONNECT_TIMEOUT)) timeout=convert_to_seconds(INPUT_CONNECT_TIMEOUT))
except Exception as err:
print(f"Connect error\n{err}")
sys.exit(1)
else:
if callback: if callback:
callback(ssh) callback(ssh)
finally: finally:
os.unlink(tmp.name) os.unlink(tmp.name)
tmp.close() tmp.close()
@ -100,10 +106,8 @@ def ssh_process(ssh, input_ssh):
err = "".join(stderr.readlines()) err = "".join(stderr.readlines())
err = err.strip() if err is not None else None err = err.strip() if err is not None else None
if err: if err:
if out is None:
raise Exception(err)
else:
print(f"Error: \n{err}") print(f"Error: \n{err}")
sys.exit(1)
pass pass
@ -130,10 +134,19 @@ def scp_process(ssh, input_scp):
with scp.SCPClient(ssh.get_transport(), progress=progress, sanitize=lambda x: x) as conn: with scp.SCPClient(ssh.get_transport(), progress=progress, sanitize=lambda x: x) as conn:
for l2r in copy_list: for l2r in copy_list:
remote = l2r.get('r') remote = l2r.get('r')
ssh.exec_command(f"mkdir -p {remote} || true") try:
ssh.exec_command(f"mkdir -p {remote}")
except Exception as err:
print(f"Remote mkdir error. Can't create {remote}\n{err}")
sys.exit(1)
for f in [f for f in glob(l2r.get('l'))]: for f in [f for f in glob(l2r.get('l'))]:
try:
conn.put(f, remote_path=remote, recursive=True) conn.put(f, remote_path=remote, recursive=True)
print(f"{f} -> {remote}") print(f"{f} -> {remote}")
except Exception as err:
print(f"Scp error. Can't copy {f} on {remote}\n{err}")
sys.exit(1)
pass pass

@ -3,5 +3,8 @@
echo "+++++++++++++++++++STARTING PIPELINES+++++++++++++++++++" echo "+++++++++++++++++++STARTING PIPELINES+++++++++++++++++++"
python3 /opt/tools/app.py python3 /opt/tools/app.py
RET=$?
echo "+++++++++++++++++++END PIPELINES+++++++++++++++++++" echo "+++++++++++++++++++END PIPELINES+++++++++++++++++++"
exit $RET

Loading…
Cancel
Save