From 6cbe28272f14d420dd5de5e3865ad452db9d4d67 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Wed, 9 Apr 2025 11:24:49 +0200 Subject: [PATCH] refs #1872 always kill browser before exiting --- CHANGELOG.md | 6 ++++++ ogclient/interfaceAdm/Configurar.py | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index aa3ac2f..f0f69ac 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.3.3] - 2025-04-09 + +### Fixed + +- Kill coproc'ed browser in all execution branches in Configurar.py + ## [0.3.2] - 2025-04-07 ### Fixed diff --git a/ogclient/interfaceAdm/Configurar.py b/ogclient/interfaceAdm/Configurar.py index 0b24360..ab74291 100755 --- a/ogclient/interfaceAdm/Configurar.py +++ b/ogclient/interfaceAdm/Configurar.py @@ -75,8 +75,11 @@ for item in tbprm: elif 'tch' == k: tch = v # Error si no se define el parámetro de disco (dis). -if dis is None: sys.exit (ogGlobals.OG_ERR_FORMAT) -if tch is None: tch = '0' +if dis is None: + coproc.kill() + sys.exit (ogGlobals.OG_ERR_FORMAT) +if tch is None: + tch = '0' # Toma valores de distribución de particiones, separados por "%". tbp = [] # Valores de configuración (parámetros para ogCreatePartitions) @@ -111,6 +114,7 @@ for item in tbprm: if tam is None: missing_params.append ('tam') if missing_params: print (f'partition data ({item}) missing required parameters ({' '.join (missing_params)})') + coproc.kill() sys.exit (1) # Componer datos de particionado. @@ -150,6 +154,7 @@ if 'CACHE' in sparam: rc = SystemLib.ogExecAndLog ('command', CacheLib.initCache, tch) if rc: SystemLib.ogRaiseError (['log', 'session'], ogGlobals.OG_ERR_CACHE, f'initCache failed') + coproc.kill() sys.exit (1) # Definir particionado. -- 2.40.1