diff --git a/__pycache__/db_conf.cpython-312.pyc b/__pycache__/db_conf.cpython-312.pyc new file mode 100644 index 0000000..d7d38f6 Binary files /dev/null and b/__pycache__/db_conf.cpython-312.pyc differ diff --git a/db_conf.py b/db_conf.py index 96ae8f6..8c899e5 100644 --- a/db_conf.py +++ b/db_conf.py @@ -3,28 +3,11 @@ import psycopg2 import json import os -def ip_db_backend_server(): - # nombre_equipo = socket.gethostname() - # direccion_ip = socket.gethostbyname(nombre_equipo) - ip_device = os.getenv("ip_device") - # print("la ip es: ", ip_device) - # print(f'La ip del equipo es : {direccion_ip}') - # ip web server : ip db server - try: - db_backend = { - "192.168.1.75": "192.168.1.79", - "192.168.1.76": "192.168.1.80", - "192.168.1.77": "192.168.1.79", - "192.168.1.78": "192.168.1.80", - "192.168.1.83": "192.168.1.79", - } - return db_backend[f'{ip_device}'] - except Exception: - return "192.168.1.80" - +ip_device = os.getenv("ip_device") +db_server = json.loads(os.getenv("dist_servs"))[ip_device] class DataBaseServer(): - db_server_ip = ip_db_backend_server() + db_server_ip = db_server port = 5432 user = "postgres" diff --git a/help_files/upgrade_coordenadas.py b/help_files/upgrade_coordenadas.py index 316f8b4..7090d75 100644 --- a/help_files/upgrade_coordenadas.py +++ b/help_files/upgrade_coordenadas.py @@ -3,8 +3,8 @@ import json import os ip_device = os.getenv("ip_device") -db_server = json.loads(os.getenv("dist_servs")) -db_server = db_server[ip_device] +db_server = json.loads(os.getenv("dist_servs"))[ip_device] + f_path = os.path.join(os.getcwd(), "json_files/coordenas_unicas.json") # cargar coordenadas a la memoria de la computadora diff --git a/help_files/upgrade_directorio_centros_sict.py b/help_files/upgrade_directorio_centros_sict.py index d1ca722..501e518 100644 --- a/help_files/upgrade_directorio_centros_sict.py +++ b/help_files/upgrade_directorio_centros_sict.py @@ -3,8 +3,7 @@ import json import os ip_device = os.getenv("ip_device") -db_server = json.loads(os.getenv("dist_servs")) -db_server = db_server[ip_device] +db_server = json.loads(os.getenv("dist_servs"))[ip_device] # Parámetros de conexión a la base de datos file_path = os.path.join(os.getcwd(), "json_files/DirectorioCSICT.json") diff --git a/help_files/upgrade_sitios_ai.py b/help_files/upgrade_sitios_ai.py index 6e134b2..875dc73 100644 --- a/help_files/upgrade_sitios_ai.py +++ b/help_files/upgrade_sitios_ai.py @@ -3,8 +3,7 @@ import json import os ip_device = os.getenv("ip_device") -db_server = json.loads(os.getenv("dist_servs")) -db_server = db_server[ip_device] +db_server = json.loads(os.getenv("dist_servs"))[ip_device] # Parámetros de conexión a la base de datos f_path = os.path.join(os.getcwd(), "json_files/sitios.json")