summaryrefslogtreecommitdiffstats
path: root/src/linux
diff options
context:
space:
mode:
authorAlvaro Neira Ayuso <aneira@soleta.eu>2020-01-13 19:20:13 +0100
committerAlvaro Neira Ayuso <alvaroneay@gmail.com>2020-01-19 19:50:44 +0100
commit1ced3dd0693fc6d88c0d5ec8432102454e10075e (patch)
tree7385e7bea7359e10e0470e537c904228b62905a5 /src/linux
parent683afa64657bf661f719e4e646457353199f38ec (diff)
Improve hardware command response behavior
This patch give us a better support in case of error or success execution. In error cases, the new behavior is to send an Internal Error http message (500). Otherwise, the server will receive a message with a json with this format: { "hardware" : "xyz" } "xyz" is the output saved in a specific path during the execution of InventarioHardware.
Diffstat (limited to 'src/linux')
-rw-r--r--src/linux/ogOperations.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/linux/ogOperations.py b/src/linux/ogOperations.py
index 0034fd7..447f188 100644
--- a/src/linux/ogOperations.py
+++ b/src/linux/ogOperations.py
@@ -48,7 +48,11 @@ def procsoftware(httpparser, path):
return result.decode('utf-8')
def prochardware(path):
- result = subprocess.check_output([OG_PATH + 'interfaceAdm/InventarioHardware', path], shell=True)
+ try:
+ result = subprocess.check_output([OG_PATH + 'interfaceAdm/InventarioHardware', path], shell=True)
+ except:
+ raise ValueError('Error: Incorrect command value')
+
return result.decode('utf-8')
def procsetup(httpparser):