Compare commits
2 commits
e84a642f75
...
ae7648ebd5
Author | SHA1 | Date | |
---|---|---|---|
|
ae7648ebd5 | ||
|
251e4c544c |
3 changed files with 21 additions and 23 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -43,6 +43,7 @@ venv/
|
||||||
env/
|
env/
|
||||||
.venv/
|
.venv/
|
||||||
.vscode/
|
.vscode/
|
||||||
|
.nova/
|
||||||
.idea/
|
.idea/
|
||||||
*~
|
*~
|
||||||
*.swp
|
*.swp
|
||||||
|
|
|
@ -37,11 +37,15 @@
|
||||||
────────────────────────────────────────────── S̝͖̦͓̪̻ O̡͖̘̫͇̟ H̢͔͔̫͉͜ O̢̢͉̞͍̘ T̟͍͍̪̦̞ R N )───────
|
────────────────────────────────────────────── S̝͖̦͓̪̻ O̡͖̘̫͇̟ H̢͔͔̫͉͜ O̢̢͉̞͍̘ T̟͍͍̪̦̞ R N )───────
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|
||||||
## Overview
|
## Overview
|
||||||
|
|
||||||
IN DRAFT
|
IN DRAFT
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
IN DRAFT
|
IN DRAFT
|
||||||
|
|
||||||
## Extras
|
## Extras
|
||||||
|
|
||||||
[Apple Shortcut for location tracking Pythonista script](https://www.icloud.com/shortcuts/d63b179f9c664b0cbbacb1a607767ef7)
|
[Apple Shortcut for location tracking Pythonista script](https://www.icloud.com/shortcuts/d63b179f9c664b0cbbacb1a607767ef7)
|
||||||
|
|
|
@ -27,14 +27,12 @@ def load_env():
|
||||||
except ValueError:
|
except ValueError:
|
||||||
logging.warning(f"Skipping invalid line in .env file: {line}")
|
logging.warning(f"Skipping invalid line in .env file: {line}")
|
||||||
|
|
||||||
|
|
||||||
def check_server(ip, port, ts_id):
|
def check_server(ip, port, ts_id):
|
||||||
address = f"http://{ip}:{port}/id"
|
address = f"http://{ip}:{port}/id"
|
||||||
logging.info(f"Checking {address} for response...")
|
|
||||||
try:
|
try:
|
||||||
response = requests.get(address, timeout=5)
|
response = requests.get(address, timeout=5)
|
||||||
response_text = response.text.strip().strip('"')
|
response_text = response.text.strip().strip('"')
|
||||||
logging.info(f"{address} responded '{response_text}'")
|
|
||||||
return response.status_code == 200 and response_text == ts_id
|
return response.status_code == 200 and response_text == ts_id
|
||||||
except requests.RequestException as e:
|
except requests.RequestException as e:
|
||||||
logging.error(f"Error checking server {ts_id}: {str(e)}")
|
logging.error(f"Error checking server {ts_id}: {str(e)}")
|
||||||
|
@ -82,7 +80,6 @@ def start_remote_server(server):
|
||||||
timeout=10
|
timeout=10
|
||||||
)
|
)
|
||||||
|
|
||||||
# Check if tmux session already exists
|
|
||||||
status, output, error = execute_ssh_command(ssh, f"{server['tmux']} has-session -t sijapi 2>/dev/null && echo 'exists' || echo 'not exists'")
|
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':
|
if output == 'exists':
|
||||||
logging.info(f"sijapi session already exists on {server['ts_id']}")
|
logging.info(f"sijapi session already exists on {server['ts_id']}")
|
||||||
|
@ -102,7 +99,6 @@ def start_remote_server(server):
|
||||||
ssh.close()
|
ssh.close()
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
load_env()
|
load_env()
|
||||||
config = load_config()
|
config = load_config()
|
||||||
|
@ -110,7 +106,6 @@ def main():
|
||||||
local_ts_id = os.environ.get('TS_ID')
|
local_ts_id = os.environ.get('TS_ID')
|
||||||
|
|
||||||
for server in pool:
|
for server in pool:
|
||||||
logging.info(f"Checking {server['ts_id']}...")
|
|
||||||
if check_server(server['ts_ip'], server['app_port'], server['ts_id']):
|
if check_server(server['ts_ip'], server['app_port'], server['ts_id']):
|
||||||
logging.info(f"{server['ts_id']} is running and responding correctly.")
|
logging.info(f"{server['ts_id']} is running and responding correctly.")
|
||||||
else:
|
else:
|
||||||
|
@ -120,9 +115,7 @@ def main():
|
||||||
else:
|
else:
|
||||||
start_remote_server(server)
|
start_remote_server(server)
|
||||||
|
|
||||||
logging.info("Waiting 5 seconds before next check...")
|
time.sleep(1)
|
||||||
time.sleep(5)
|
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
Loading…
Reference in a new issue