From acc9c2ed07e135f0aab17e62f48546fd8589fa52 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 16 May 2025 14:49:35 +0200 Subject: [PATCH] refs #1998 run the new browser --- CHANGELOG.md | 6 ++++++ linux/debian/changelog | 6 ++++++ src/VERSION | 2 +- src/opengnsys/workers/oglive_worker.py | 8 +++++--- 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e774716..a3f6ba6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,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). +## [5.3.0] - 2025-05-16 + +### Changed + +- Execute 'launch_browser' rather than 'browser' + ## [5.2.0] - 2025-05-14 ### Added diff --git a/linux/debian/changelog b/linux/debian/changelog index 51f72ee..2266905 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,3 +1,9 @@ +ogagent (5.3.0-1) stable; urgency=medium + + * Execute 'launch_browser' rather than 'browser' + + -- OpenGnsys developers Wed, 14 May 2025 10:50:15 +0200 + ogagent (5.2.0-1) stable; urgency=medium * Log length of user sessions diff --git a/src/VERSION b/src/VERSION index 91ff572..03f488b 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -5.2.0 +5.3.0 diff --git a/src/opengnsys/workers/oglive_worker.py b/src/opengnsys/workers/oglive_worker.py index f2f25f1..2ee36aa 100644 --- a/src/opengnsys/workers/oglive_worker.py +++ b/src/opengnsys/workers/oglive_worker.py @@ -369,12 +369,14 @@ class ogLiveWorker(ServerWorker): def cargaPaginaWeb (self, url=None): if (not url): url = self.urlMenu - os.system ('pkill -9 browser') + os.system ('pkill -f -9 browser') + os.system ('pkill -f -9 OGBrowser') + os.system ('pkill -f -9 QtWebEngineProcess') - p = subprocess.Popen (['/usr/bin/browser', '-qws', url]) + p = subprocess.Popen (['/usr/bin/launch_browser', url]) try: p.wait (2) ## if the process dies before 2 seconds... - logger.error ('Error al ejecutar browser, return code "{}"'.format (p.returncode)) + logger.error ('Error al ejecutar OGBrowser, return code "{}"'.format (p.returncode)) return False except subprocess.TimeoutExpired: pass