diff options
| author | John Estabrook <jestabro@vyos.io> | 2020-07-22 14:25:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 14:25:58 -0500 |
| commit | da65aa2290e54f47dcc9c527723557fdbe2cb892 (patch) | |
| tree | ea8848624d98e4b1693b45c0ea3021f00d646d80 /src/services/vyos-http-api-server | |
| parent | 632b3693097f665464d3072da138eb9a7e370309 (diff) | |
| parent | 280044183e086c1ef1fbe9e8a7291f738bb7e504 (diff) | |
| download | vyos-1x-da65aa2290e54f47dcc9c527723557fdbe2cb892.tar.gz vyos-1x-da65aa2290e54f47dcc9c527723557fdbe2cb892.zip | |
Merge pull request #499 from jestabro/config_source
T2707: allow alternative initialization data for config
config: T2707: use ConfigSource and refactor Config methods
load-config: subclass ConfigSourceSession instead of Config
http-api: remove unneeded check for VyOSError
config: T2707: add ConfigSource classes for alternative init data
Diffstat (limited to 'src/services/vyos-http-api-server')
| -rwxr-xr-x | src/services/vyos-http-api-server | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/services/vyos-http-api-server b/src/services/vyos-http-api-server index 4c41fa96d..d5730d86c 100755 --- a/src/services/vyos-http-api-server +++ b/src/services/vyos-http-api-server @@ -32,7 +32,6 @@ from waitress import serve from functools import wraps from vyos.configsession import ConfigSession, ConfigSessionError -from vyos.config import VyOSError DEFAULT_CONFIG_FILE = '/etc/vyos/http-api.conf' @@ -231,8 +230,6 @@ def retrieve_op(command): return error(400, "\"{0}\" is not a valid config format".format(config_format)) else: return error(400, "\"{0}\" is not a valid operation".format(op)) - except VyOSError as e: - return error(400, str(e)) except ConfigSessionError as e: return error(400, str(e)) except Exception as e: |