diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2014-09-08 14:32:42 +0200 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2014-09-08 14:32:42 +0200 |
| commit | d06b4bfa4e4cc51e903b49e246d7771726a3e3a4 (patch) | |
| tree | 23b215550d09202b987540485c8bbea25ee96f46 /libmproxy/console/__init__.py | |
| parent | 6dbe431c5e680d1c7f693a4c7bb7f3f65314c5c6 (diff) | |
| download | mitmproxy-d06b4bfa4e4cc51e903b49e246d7771726a3e3a4.tar.gz mitmproxy-d06b4bfa4e4cc51e903b49e246d7771726a3e3a4.tar.bz2 mitmproxy-d06b4bfa4e4cc51e903b49e246d7771726a3e3a4.zip | |
remove proxy mode abstraction: always be clear which mode we are in
Diffstat (limited to 'libmproxy/console/__init__.py')
| -rw-r--r-- | libmproxy/console/__init__.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/libmproxy/console/__init__.py b/libmproxy/console/__init__.py index d235a327..ddbf72b6 100644 --- a/libmproxy/console/__init__.py +++ b/libmproxy/console/__init__.py @@ -175,13 +175,12 @@ class StatusBar(common.WWrap): if opts: r.append("[%s]"%(":".join(opts))) - if self.master.server.config.get_upstream_server and \ - isinstance(self.master.server.config.get_upstream_server, proxy.ConstUpstreamServerResolver): - dst = self.master.server.config.get_upstream_server.dst + if self.master.server.config.mode in ["reverse", "upstream"]: + dst = self.master.server.config.mode.dst scheme = "https" if dst[0] else "http" if dst[1] != dst[0]: scheme += "2https" if dst[1] else "http" - r.append("[dest:%s]"%utils.unparse_url(scheme, *self.master.server.config.get_upstream_server.dst[2:])) + r.append("[dest:%s]"%utils.unparse_url(scheme, *dst[2:])) if self.master.scripts: r.append("[") r.append(("heading_key", "s")) |