From 40064be81d1fa997d2a719cd451d40acc2fc09cb Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 8 Aug 2025 13:11:41 +0200 Subject: [PATCH 1/3] refs #2616 handle nested exceptions --- src/opengnsys/httpserver.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/opengnsys/httpserver.py b/src/opengnsys/httpserver.py index 695ab9d..391cc94 100644 --- a/src/opengnsys/httpserver.py +++ b/src/opengnsys/httpserver.py @@ -105,6 +105,7 @@ class HTTPServerHandler(BaseHTTPRequestHandler): self.sendJsonError(500, exceptionToMessage(e)) else: arg0 = e.args[0] + while isinstance (arg0, Exception): arg0 = arg0.args[0] ## handle nested exceptions if type (arg0) is str: logger.debug ('Message processor for "{}" returned exception string "{}"'.format(path[0], str(e))) self.sendJsonError (500, exceptionToMessage(e)) From e8e858d4cec03ae4b9f7ecdd274c51cb8a4b354b Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 8 Aug 2025 13:12:21 +0200 Subject: [PATCH 2/3] refs #2615 return 409 on >1 background jobs --- src/opengnsys/workers/oglive_worker.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/opengnsys/workers/oglive_worker.py b/src/opengnsys/workers/oglive_worker.py index 8cfdd5a..0e538b0 100644 --- a/src/opengnsys/workers/oglive_worker.py +++ b/src/opengnsys/workers/oglive_worker.py @@ -508,7 +508,7 @@ class ogLiveWorker(ServerWorker): break if any_job_running: logger.info ('some job is already running, refusing to launch another one') - return { 'job_id': None, 'message': 'some job is already running, refusing to launch another one' } + raise Exception ({ '_httpcode': 409, '_msg': 'some job is already running, refusing to launch another one' }) job_id = '{}-{}'.format (name, ''.join (random.choice ('0123456789abcdef') for _ in range (8))) import queue From abc2de9f70d91df0bce34608ce595ba97b7d8c39 Mon Sep 17 00:00:00 2001 From: Natalia Serrano Date: Fri, 8 Aug 2025 13:14:05 +0200 Subject: [PATCH 3/3] refs #2615 update changelogs --- CHANGELOG.md | 6 ++++++ linux/debian/changelog | 6 ++++++ src/VERSION | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db32cde..5104059 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). +## [8.0.0] - 2025-08-08 + +### Changed + +- Return HTTP 409 on more than one background jobs + ## [7.3.3] - 2025-08-07 ### Fixed diff --git a/linux/debian/changelog b/linux/debian/changelog index 64e77a8..8dba308 100644 --- a/linux/debian/changelog +++ b/linux/debian/changelog @@ -1,3 +1,9 @@ +ogagent (8.0.0-1) stable; urgency=medium + + * Return HTTP 409 on more than one background jobs + + -- OpenGnsys developers Fri, 08 Aug 2025 13:13:33 +0200 + ogagent (7.3.3-1) stable; urgency=medium * wait() for the browser diff --git a/src/VERSION b/src/VERSION index 44e98ad..ae9a76b 100644 --- a/src/VERSION +++ b/src/VERSION @@ -1 +1 @@ -7.3.3 +8.0.0