From ec292a262066931d30189daebcbc66eb863f612a Mon Sep 17 00:00:00 2001
From: sanj <67624670+iodrift@users.noreply.github.com>
Date: Sat, 9 Nov 2024 18:12:05 -0800
Subject: [PATCH] auto-update
---
sijapi/helpers/start.py | 88 +++++++++++++++++++++++++++++------------
1 file changed, 62 insertions(+), 26 deletions(-)
diff --git a/sijapi/helpers/start.py b/sijapi/helpers/start.py
index 9fa7ce1..7f5c925 100644
--- a/sijapi/helpers/start.py
+++ b/sijapi/helpers/start.py
@@ -74,18 +74,44 @@ def start_local_server(server, pull=False, push=False):
logging.error(f"Failed to start sijapi session on local machine. Error: {e}")
logging.error(f"Error output: {e.stderr}")
+def kill_local_server():
+ try:
+ if is_local_tmux_session_running('sijapi'):
+ subprocess.run(['tmux', 'kill-session', '-t', 'sijapi'], check=True)
+ logging.info("Killed local sijapi tmux session.")
+ else:
+ logging.info("No local sijapi tmux session to kill.")
+ except subprocess.CalledProcessError as e:
+ logging.error(f"Failed to kill local sijapi tmux session. Error: {e}")
+
def start_remote_server(server, pull=False, push=False):
ssh = paramiko.SSHClient()
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
try:
- ssh.connect(
- server['ts_ip'],
- port=server['ssh_port'],
- username=server['ssh_user'],
- password=server['ssh_pass'],
- timeout=10
- )
+ # Determine authentication method based on config
+ if 'ssh_key' in server:
+ # Use SSH key authentication
+ private_key = paramiko.RSAKey.from_private_key_file(server['ssh_key'])
+ ssh.connect(
+ server['ts_ip'],
+ port=server['ssh_port'],
+ username=server['ssh_user'],
+ pkey=private_key,
+ timeout=10
+ )
+ elif 'ssh_pass' in server:
+ # Use password authentication
+ ssh.connect(
+ server['ts_ip'],
+ port=server['ssh_port'],
+ username=server['ssh_user'],
+ password=server['ssh_pass'],
+ timeout=10
+ )
+ else:
+ logging.error(f"No authentication method specified for {server['ts_id']}")
+ return
status, output, error = execute_ssh_command(ssh, f"{server['tmux']} has-session -t sijapi 2>/dev/null && echo 'exists' || echo 'not exists'")
if output == 'exists':
@@ -108,31 +134,39 @@ def start_remote_server(server, pull=False, push=False):
except paramiko.SSHException as e:
logging.error(f"Failed to connect to {server['ts_id']}: {str(e)}")
+ except Exception as e:
+ logging.error(f"Error connecting to {server['ts_id']}: {str(e)}")
finally:
ssh.close()
-def kill_local_server():
- try:
- if is_local_tmux_session_running('sijapi'):
- subprocess.run(['tmux', 'kill-session', '-t', 'sijapi'], check=True)
- logging.info("Killed local sijapi tmux session.")
- else:
- logging.info("No local sijapi tmux session to kill.")
- except subprocess.CalledProcessError as e:
- logging.error(f"Failed to kill local sijapi tmux session. Error: {e}")
-
def kill_remote_server(server):
ssh = paramiko.SSHClient()
ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
try:
- ssh.connect(
- server['ts_ip'],
- port=server['ssh_port'],
- username=server['ssh_user'],
- password=server['ssh_pass'],
- timeout=10
- )
+ # Determine authentication method based on config
+ if 'ssh_key' in server:
+ # Use SSH key authentication
+ private_key = paramiko.RSAKey.from_private_key_file(server['ssh_key'])
+ ssh.connect(
+ server['ts_ip'],
+ port=server['ssh_port'],
+ username=server['ssh_user'],
+ pkey=private_key,
+ timeout=10
+ )
+ elif 'ssh_pass' in server:
+ # Use password authentication
+ ssh.connect(
+ server['ts_ip'],
+ port=server['ssh_port'],
+ username=server['ssh_user'],
+ password=server['ssh_pass'],
+ timeout=10
+ )
+ else:
+ logging.error(f"No authentication method specified for {server['ts_id']}")
+ return
command = f"{server['tmux']} kill-session -t sijapi"
status, output, error = execute_ssh_command(ssh, command)
@@ -144,9 +178,12 @@ def kill_remote_server(server):
except paramiko.SSHException as e:
logging.error(f"Failed to connect to {server['ts_id']}: {str(e)}")
+ except Exception as e:
+ logging.error(f"Error connecting to {server['ts_id']}: {str(e)}")
finally:
ssh.close()
+
def main():
load_env()
db_config = load_config('sys')
@@ -207,5 +244,4 @@ def main():
time.sleep(1)
if __name__ == "__main__":
- main()
-
+ main()
\ No newline at end of file