From 400d163bf581de2c3aee26aceebb9af470d8e54a Mon Sep 17 00:00:00 2001 From: Christopher Baklid Date: Thu, 5 Jul 2018 16:52:48 +0200 Subject: remove excessive logging and attempt getting stacktrace --- config.py | 3 ++- rmq.py | 4 ---- snekbox.py | 10 +++++----- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/config.py b/config.py index c32f79d..7214318 100644 --- a/config.py +++ b/config.py @@ -19,7 +19,8 @@ def autodiscover(): continue except Exception: - print(traceback.format_exc()) + pass + #print(traceback.format_exc()) return '127.0.0.1' diff --git a/rmq.py b/rmq.py index ef5e8c2..493a38f 100644 --- a/rmq.py +++ b/rmq.py @@ -116,10 +116,6 @@ class Rmq(object): properties=self.properties) if result: - log.info((f"published: {self.host} " - f"queue: {queue} " - f"message: {message}")) - return result else: diff --git a/snekbox.py b/snekbox.py index b3ee27e..70a2e10 100644 --- a/snekbox.py +++ b/snekbox.py @@ -60,7 +60,11 @@ class Snekbox(object): elif proc.returncode == 1: try: - output = stderr.split('\n')[-2] + filtered = [] + for line in stderr.split('\n'): + if not line.startswith('['): + filtered.append(line) + output = '\n'.join(filtered) except IndexError: output = '' @@ -71,14 +75,12 @@ class Snekbox(object): output = 'permission denied (root required)' else: - log.debug(stderr) output = 'unknown error' return output def execute(self, body): msg = body.decode('utf-8') - log.info(f'incoming: {msg}') result = '' snek_msg = json.loads(msg) snekid = snek_msg['snekid'] @@ -86,8 +88,6 @@ class Snekbox(object): result = self.python3(snekcode) - log.info(f'outgoing: {result}') - rmq.publish(result, queue=snekid, routingkey=snekid, -- cgit v1.2.3