From a0e9b417f4af0e797e8b09f34ed204b5e8229d6d Mon Sep 17 00:00:00 2001 From: CoolCoderCarl <123qwekir2wl@gmail.com> Date: Fri, 26 Apr 2024 13:41:53 +0300 Subject: [PATCH] Add platform switcher and request conf sections --- docker-compose.yaml | 1 + settings.toml | 5 ++++- src/main.py | 20 ++++++++++++++------ 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index d2c55e8..1cbc332 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -10,6 +10,7 @@ services: SETTINGS_FILE_FOR_DYNACONF: "/opt/settings.toml" VERBOSE: "True" ALERTING: "True" + PLATFORM: "True" ENVIRONMENT: "Dev" # CHANEL: "TODO" networks: diff --git a/settings.toml b/settings.toml index b9921e2..f04a471 100644 --- a/settings.toml +++ b/settings.toml @@ -19,4 +19,7 @@ HOSTS = [ [TELEGRAM] API_TOKEN = "12334567890qwertyuiop" -CHAT_ID = "1234567" \ No newline at end of file +CHAT_ID = "1234567" + +[REQUEST] +TIMEOUT = 5 \ No newline at end of file diff --git a/src/main.py b/src/main.py index 5ad18d1..0f46ed9 100644 --- a/src/main.py +++ b/src/main.py @@ -1,6 +1,6 @@ import logging import os -from platform import processor, uname # TODO add platform env var +from platform import processor, uname from time import sleep import requests @@ -31,6 +31,13 @@ except KeyError as key_err: logging.warning(f"Key Error - {key_err}") +try: + PLATFORM = bool(os.getenv("PLATFORM")) + if PLATFORM: + logger.info(f"Platform info activated !") +except KeyError as key_err: + logging.warning(f"Key Error - {key_err}") + try: ENVIRONMENT = os.getenv("ENVIRONMENT") if ENVIRONMENT: @@ -97,7 +104,7 @@ def http_requests(hosts: list): for host in hosts: try: logging.info(f"Going to request {host}") - response = requests.get(f"http://{host}", timeout=5) + response = requests.get(f"http://{host}", timeout=dynaconfig.settings["REQUEST"]["TIMEOUT"]) if VERBOSE: logging.info(response.text) # TODO parse json logging.info(response.headers) @@ -131,9 +138,10 @@ def http_requests(hosts: list): icmp_requests(icmp_hosts) http_requests(http_hosts) sleep(1) + if PLATFORM: + logger.info(f"Processor: {processor()}") + sleep(1) + logger.info(f"Uname: {uname()}") + sleep(1) except ValueError as val_err: logging.warning(f"Config was not loaded - Value Error - {val_err}") - # logger.info(f"Processor: {processor()}") - # sleep(1) - # logger.info(f"Uname: {uname()}") - # sleep(1)