From b571f40482c478af78da7014415e6d95c2a6a8a7 Mon Sep 17 00:00:00 2001 From: Alvaro Neira Ayuso Date: Sat, 28 Dec 2019 17:18:38 +0100 Subject: Blocks the program execution until a command is processing This patch changes the command process blocking the execution until is processing. Moreover, the response will be OK (200) instead of IN_PROGRESS (202). --- src/ogRest.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/ogRest.py b/src/ogRest.py index f470f0b..80f6acd 100644 --- a/src/ogRest.py +++ b/src/ogRest.py @@ -11,6 +11,7 @@ if platform.system() == 'Linux': class ogThread(): # Executing cmd thread def execcmd(msgqueue, cmd): + msgqueue.queue.clear() msgqueue.put(ogOperations.execCMD(cmd)) # Powering off thread @@ -95,12 +96,12 @@ class ogRest(): client.send(self.getResponse(ogResponses.BAD_REQUEST)) return - threading.Thread(target=ogThread.execcmd, args=(self.msgqueue, cmd,)).start() - client.send(self.getResponse(ogResponses.IN_PROGRESS)) + ogThread.execcmd(self.msgqueue, cmd) + client.send(self.getResponse(ogResponses.OK)) def process_shellout(self, client): if self.msgqueue.empty(): - client.send(self.getResponse(ogResponses.IN_PROGRESS, 'out', '')) + client.send(self.getResponse(ogResponses.OK, 'out', '')) else: out = self.msgqueue.get() - client.send(self.getResponse(ogResponses.IN_PROGRESS, 'out', out)) + client.send(self.getResponse(ogResponses.OK, 'out', out)) -- cgit v1.2.3-18-g5258