removing cmd_output function from utils and nodes

2019-10-11 09:34:49 -07:00 · 2019-10-11 09:34:49 -07:00 · 4a6d69bb09
commit 4a6d69bb09
parent c3d27eb8a5
10 changed files with 51 additions and 193 deletions
--- a/daemon/core/api/tlv/corehandlers.py
+++ b/daemon/core/api/tlv/corehandlers.py
@ -889,7 +889,12 @@ class CoreHandler(socketserver.BaseRequestHandler):
                    or message.flags & MessageFlags.TEXT.value
                ):
                    if message.flags & MessageFlags.LOCAL.value:
-                        status, res = utils.cmd_output(command)
+                        try:
+                            res = utils.check_cmd(command)
+                            status = 0
+                        except CoreCommandError as e:
+                            res = e.stderr
+                            status = e.returncode
                    else:
                        try:
                            res = node.node_net_cmd(command)