From 254614e9f77e108d186ff3f7e89ec78012af65a1 Mon Sep 17 00:00:00 2001 From: Aldo Cortesi Date: Thu, 2 Jun 2016 18:10:36 +1200 Subject: Since we have locks over the logs, use direct access rather than API requests to get to them --- pathod/test.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'pathod') diff --git a/pathod/test.py b/pathod/test.py index 797b4970..0804951e 100644 --- a/pathod/test.py +++ b/pathod/test.py @@ -75,16 +75,13 @@ class Daemon: """ Return the log buffer as a list of dictionaries. """ - resp = requests.get("%s/api/log" % self.urlbase, verify=False) - return resp.json()["log"] + return self.thread.server.get_log() def clear_log(self): """ Clear the log. """ - self.logfp.truncate(0) - resp = requests.get("%s/api/clear_log" % self.urlbase, verify=False) - return resp.ok + return self.thread.server.clear_log() def shutdown(self): """ @@ -101,6 +98,7 @@ class _PaThread(threading.Thread): self.name = "PathodThread" self.iface, self.q, self.ssl = iface, q, ssl self.daemonargs = daemonargs + self.server = None def run(self): self.server = pathod.Pathod( -- cgit v1.2.3