aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2015-01-09 00:39:36 +0100
committerMaximilian Hils <git@maximilianhils.com>2015-01-09 00:39:36 +0100
commitdcc248797f92ec8c5971849e6f907a6bd4f2a4a3 (patch)
tree10a00c6b06e70546fcc7ee41c39d25994f1ec24b
parent72690f28647558c7c7d9c63020a794feb181b933 (diff)
parent3dcba41d6d1f9c2d4307978b1176fe990d10bc5a (diff)
downloadmitmproxy-dcc248797f92ec8c5971849e6f907a6bd4f2a4a3.tar.gz
mitmproxy-dcc248797f92ec8c5971849e6f907a6bd4f2a4a3.tar.bz2
mitmproxy-dcc248797f92ec8c5971849e6f907a6bd4f2a4a3.zip
Merge pull request #442 from nickhs/441
Error to stdout when loading bad replays from the command line
-rw-r--r--libmproxy/console/__init__.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py
index f5b6a2a6..1e7f8403 100644
--- a/libmproxy/console/__init__.py
+++ b/libmproxy/console/__init__.py
@@ -508,14 +508,22 @@ class ConsoleMaster(flow.FlowMaster):
def client_playback_path(self, path):
err, ret = self._readflow(path)
if err:
- self.statusbar.message(ret)
+ if not self.statusbar:
+ print >> sys.stderr, ret
+ sys.exit(1)
+ else:
+ self.statusbar.message(ret)
else:
self.start_client_playback(ret, False)
def server_playback_path(self, path):
err, ret = self._readflow(path)
if err:
- self.statusbar.message(ret)
+ if not self.statusbar:
+ print >> sys.stderr, ret
+ sys.exit(1)
+ else:
+ self.statusbar.message(ret)
else:
self.start_server_playback(
ret,