diff options
author | Maximilian Hils <git@maximilianhils.com> | 2016-07-08 15:49:38 -0700 |
---|---|---|
committer | Maximilian Hils <git@maximilianhils.com> | 2016-07-08 15:50:11 -0700 |
commit | 0a1431ed2c638ceb34308d38250eab2717640c49 (patch) | |
tree | 714bfaa3a7a583d37f203fa669f4916132bc12c5 /netlib | |
parent | 035f9898903140efc02007028cc5497fe2bde3c6 (diff) | |
download | mitmproxy-0a1431ed2c638ceb34308d38250eab2717640c49.tar.gz mitmproxy-0a1431ed2c638ceb34308d38250eab2717640c49.tar.bz2 mitmproxy-0a1431ed2c638ceb34308d38250eab2717640c49.zip |
fix #1314
Diffstat (limited to 'netlib')
-rw-r--r-- | netlib/debug.py | 43 |
1 files changed, 23 insertions, 20 deletions
diff --git a/netlib/debug.py b/netlib/debug.py index a395afcb..fcd72a21 100644 --- a/netlib/debug.py +++ b/netlib/debug.py @@ -7,8 +7,6 @@ import signal import platform import traceback -import psutil - from netlib import version from OpenSSL import SSL @@ -40,15 +38,32 @@ def sysinfo(): def dump_info(sig, frm, file=sys.stdout): # pragma: no cover - p = psutil.Process() - print("****************************************************", file=file) print("Summary", file=file) print("=======", file=file) - print("num threads: ", p.num_threads(), file=file) - if hasattr(p, "num_fds"): - print("num fds: ", p.num_fds(), file=file) - print("memory: ", p.memory_info(), file=file) + + try: + import psutil + except: + print("(psutil not installed, skipping some debug info)", file=file) + else: + p = psutil.Process() + print("num threads: ", p.num_threads(), file=file) + if hasattr(p, "num_fds"): + print("num fds: ", p.num_fds(), file=file) + print("memory: ", p.memory_info(), file=file) + + print(file=file) + print("Files", file=file) + print("=====", file=file) + for i in p.open_files(): + print(i, file=file) + + print(file=file) + print("Connections", file=file) + print("===========", file=file) + for i in p.connections(): + print(i, file=file) print(file=file) print("Threads", file=file) @@ -63,18 +78,6 @@ def dump_info(sig, frm, file=sys.stdout): # pragma: no cover for i in bthreads: print(i._threadinfo(), file=file) - print(file=file) - print("Files", file=file) - print("=====", file=file) - for i in p.open_files(): - print(i, file=file) - - print(file=file) - print("Connections", file=file) - print("===========", file=file) - for i in p.connections(): - print(i, file=file) - print("****************************************************", file=file) |