diff --git a/bin/runTorrentSeeder.py b/bin/runTorrentSeeder.py index 2496d76..e43f377 100644 --- a/bin/runTorrentSeeder.py +++ b/bin/runTorrentSeeder.py @@ -34,27 +34,27 @@ repo_path = '/opt/opengnsys/ogrepository/images' # En este caso, no lleva barra -def run_bittornado(repo_path): - """ Ejecuta el comando "btlaunchmany.bittornado", con sus parámetros correspondientes. - Además, captura el resultado y los posibles errores, y los imprime. - """ - # Creamos una lista con el comando "btlaunchmany.bittornado" y sus parámetros, y lo imprimimos con espacios: - splitted_cmd = f"btlaunchmany.bittornado {repo_path}".split() - print(f"Sending command: {' '.join(splitted_cmd)}") - journal.send(f"runTorrentSeeder.py: Running command: {' '.join(splitted_cmd)}", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG") +# def run_bittornado(repo_path): +# """ Ejecuta el comando "btlaunchmany.bittornado", con sus parámetros correspondientes. +# Además, captura el resultado y los posibles errores, y los imprime. +# """ +# # Creamos una lista con el comando "btlaunchmany.bittornado" y sus parámetros, y lo imprimimos con espacios: +# splitted_cmd = f"btlaunchmany.bittornado {repo_path}".split() +# print(f"Sending command: {' '.join(splitted_cmd)}") +# journal.send(f"runTorrentSeeder.py: Running command: {' '.join(splitted_cmd)}", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG") - # Ejecutamos el comando "btlaunchmany.bittornado" en el sistema, e imprimimos el resultado: - try: - result = subprocess.run(splitted_cmd, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) - journal.send(f"runTorrentSeeder.py: Command ReturnCode: {result.returncode}", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG") - print(f"Bittornado ReturnCode: {result.returncode}") - except subprocess.CalledProcessError as error: - journal.send("runTorrentSeeder.py: Process finalized", PRIORITY=journal.LOG_WARNING, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG") - print(f"Bittornado ReturnCode: {error.returncode}") - print(f"Bittornado Error Output: {error.stderr.decode()}") - except Exception as error: - journal.send(f"runTorrentSeeder.py: Command exception: {error}", PRIORITY=journal.LOG_ERR, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG") - print(f"Unexpected bittornado error: {error}") +# # Ejecutamos el comando "btlaunchmany.bittornado" en el sistema, e imprimimos el resultado: +# try: +# result = subprocess.run(splitted_cmd, check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE) +# journal.send(f"runTorrentSeeder.py: Command ReturnCode: {result.returncode}", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG") +# print(f"Bittornado ReturnCode: {result.returncode}") +# except subprocess.CalledProcessError as error: +# journal.send("runTorrentSeeder.py: Process finalized", PRIORITY=journal.LOG_WARNING, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG") +# print(f"Bittornado ReturnCode: {error.returncode}") +# print(f"Bittornado Error Output: {error.stderr.decode()}") +# except Exception as error: +# journal.send(f"runTorrentSeeder.py: Command exception: {error}", PRIORITY=journal.LOG_ERR, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG") +# print(f"Unexpected bittornado error: {error}") @@ -91,7 +91,8 @@ def run_aria2c_seeder(image_name): journal.send(f"Launching aria2c seeder for {image_name}", PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api") - + journal.send(f"Command: {' '.join(cmd)}", + PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api") print("Running command:", ' '.join(cmd)) try: subprocess.run(cmd, check=True) @@ -120,13 +121,15 @@ def main(): found = False # Matamos los procesos de aria2c que sirvan la imagen en concreto. Chequeamos todos los procesos + journal.send(f"runTorrentSeeder.py: looking for aria2c processes for {image_name}.torrent", + PRIORITY=journal.LOG_INFO, SYSLOG_IDENTIFIER="ogrepo-api_DEBUG") for proc in psutil.process_iter(['pid','name','cmdline']): try: if proc.info['name'] != 'aria2c': continue if any(arg.endswith(torrent_file) for arg in proc.info['cmdline']): - proc.kill() + proc.terminate() found = True print(f"Killed aria2c process with PID {proc.info['pid']} for {image_name}.torrent") journal.send(f"runTorrentSeeder.py: Killed aria2c process with PID {proc.info['pid']} for {image_name}.torrent",