summaryrefslogtreecommitdiff
path: root/src/services/vyos-http-api-server
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-09-20 22:29:39 +0200
committerGitHub <noreply@github.com>2024-09-20 22:29:39 +0200
commit936b3acd0fc5f8dc16f4fe240c534441bc59e9fe (patch)
treec29904fa541d5496729ed7f480e87c2d54d393fd /src/services/vyos-http-api-server
parent394c2ad60b9d78b516facd9509493f719643323c (diff)
parent8e902ffa7019d2e2c0849af6fd26461ca4abba16 (diff)
downloadvyos-1x-936b3acd0fc5f8dc16f4fe240c534441bc59e9fe.tar.gz
vyos-1x-936b3acd0fc5f8dc16f4fe240c534441bc59e9fe.zip
Merge pull request #4090 from jestabro/configd-err-out
http-api: T6326: return full warning/error output through api
Diffstat (limited to 'src/services/vyos-http-api-server')
-rwxr-xr-xsrc/services/vyos-http-api-server4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/services/vyos-http-api-server b/src/services/vyos-http-api-server
index 97633577d..91100410c 100755
--- a/src/services/vyos-http-api-server
+++ b/src/services/vyos-http-api-server
@@ -577,7 +577,9 @@ def _configure_op(data: Union[ConfigureModel, ConfigureListModel,
background_tasks.add_task(call_commit, session)
msg = self_ref_msg
else:
- session.commit()
+ # capture non-fatal warnings
+ out = session.commit()
+ msg = out if out else msg
logger.info(f"Configuration modified via HTTP API using key '{app.state.vyos_id}'")
except ConfigSessionError as e: