aboutsummaryrefslogtreecommitdiffstats
path: root/pathod/test.py
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@nullcube.com>2016-06-02 18:10:36 +1200
committerAldo Cortesi <aldo@nullcube.com>2016-06-02 18:10:36 +1200
commit254614e9f77e108d186ff3f7e89ec78012af65a1 (patch)
tree878cad506234f96de482e65d58a85e28afac6da2 /pathod/test.py
parent40156ce123962a6d0e431761833a506ec5aeebb9 (diff)
downloadmitmproxy-254614e9f77e108d186ff3f7e89ec78012af65a1.tar.gz
mitmproxy-254614e9f77e108d186ff3f7e89ec78012af65a1.tar.bz2
mitmproxy-254614e9f77e108d186ff3f7e89ec78012af65a1.zip
Since we have locks over the logs, use direct access rather than API requests to get to them
Diffstat (limited to 'pathod/test.py')
-rw-r--r--pathod/test.py8
1 files changed, 3 insertions, 5 deletions
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(