From da9bd96ec83e4b8c3c4c9390008bbe93b9e88468 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ram=C3=B3n=20M=2E=20G=C3=B3mez?= Date: Thu, 5 Jul 2018 13:50:17 +0200 Subject: [PATCH] #750: Renaming server REST route {{{GET /done}}} to {{{GET /command_done}}} to log commands executed on clients. --- src/opengnsys/modules/server/OpenGnSys/__init__.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/opengnsys/modules/server/OpenGnSys/__init__.py b/src/opengnsys/modules/server/OpenGnSys/__init__.py index 1832652..abeeaae 100644 --- a/src/opengnsys/modules/server/OpenGnSys/__init__.py +++ b/src/opengnsys/modules/server/OpenGnSys/__init__.py @@ -364,7 +364,7 @@ class OpenGnSysWorker(ServerWorker): route = post_params.get('redirect_url') # Checking if the thread id. exists for c in self.commands: - if c.getName() == op_id: + if c.getName() == str(op_id): raise Exception('Task id. already exists: {}'.format(op_id)) # Launching a new thread thr = threading.Thread(name=op_id, target=self.task_command, args=(script, route, op_id)) @@ -393,6 +393,16 @@ class OpenGnSysWorker(ServerWorker): data.append(c.__dict__['_Thread__args']) return data + def process_stopcmd(self, path, get_params, post_params, server): + logger.debug('Received stopcmd operation with params {}:'.format(post_params)) + self.checkSecret(server) + op_id = post_params.get('trace') + for c in self.commands: + if c.is_alive() and c.getName() == str(op_id): + c._Thread__stop() + return {"stopped": op_id} + return {} + def process_hardware(self, path, get_params, post_params, server): """ Returns client's hardware profile