summaryrefslogtreecommitdiff
path: root/src/services
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2020-09-16 11:24:16 -0500
committerJohn Estabrook <jestabro@vyos.io>2020-09-16 12:20:41 -0500
commit6ac916ecd58cf1515dd5b9b47283d5528d0c265b (patch)
treeaf5c2dec0f8f88354bf00822049b4eb2e607ae36 /src/services
parent7faa60cd31d6dfaafbf60086edba890751dd7002 (diff)
downloadvyos-1x-6ac916ecd58cf1515dd5b9b47283d5528d0c265b.tar.gz
vyos-1x-6ac916ecd58cf1515dd5b9b47283d5528d0c265b.zip
configd: T2885: fix output of error string to config session
Diffstat (limited to 'src/services')
-rwxr-xr-xsrc/services/vyos-configd4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/services/vyos-configd b/src/services/vyos-configd
index 579605e8c..642952936 100755
--- a/src/services/vyos-configd
+++ b/src/services/vyos-configd
@@ -111,6 +111,7 @@ def explicit_print(t, m):
try:
with open(t, 'w') as f:
f.write(m)
+ f.write("\n")
f.flush()
except Exception:
pass
@@ -124,7 +125,7 @@ def run_script(script, config) -> int:
script.apply(c)
except ConfigError as e:
logger.critical(e)
- explicit_print(session_tty, e)
+ explicit_print(session_tty, str(e))
return R_ERROR_COMMIT
except Exception:
return R_ERROR_DAEMON
@@ -132,6 +133,7 @@ def run_script(script, config) -> int:
return R_SUCCESS
def initialization(socket):
+ global session_tty
# Reset config strings:
active_string = ''
session_string = ''