From 0253e980418c77b95f5c0f82240cccfd53da89a3 Mon Sep 17 00:00:00 2001 From: Michael Schuster Date: Thu, 18 Jun 2020 20:13:57 +0200 Subject: [PATCH] Improve proxy logging: Log type string instead of abstract ID The format in the client log was: 3://host:port Now it is shown like: HttpProxy://host:port The old ID display was confusing and misleading users (and people debugging it ;p) Signed-off-by: Michael Schuster --- src/libsync/clientproxy.cpp | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/libsync/clientproxy.cpp b/src/libsync/clientproxy.cpp index 8d078f2dd..92fb2ab29 100644 --- a/src/libsync/clientproxy.cpp +++ b/src/libsync/clientproxy.cpp @@ -56,9 +56,29 @@ bool ClientProxy::isUsingSystemDefault() return true; } +const char *proxyTypeToCStr(QNetworkProxy::ProxyType type) +{ + switch (type) { + case QNetworkProxy::NoProxy: + return "NoProxy"; + case QNetworkProxy::DefaultProxy: + return "DefaultProxy"; + case QNetworkProxy::Socks5Proxy: + return "Socks5Proxy"; + case QNetworkProxy::HttpProxy: + return "HttpProxy"; + case QNetworkProxy::HttpCachingProxy: + return "HttpCachingProxy"; + case QNetworkProxy::FtpCachingProxy: + return "FtpCachingProxy"; + default: + return "NoProxy"; + } +} + QString printQNetworkProxy(const QNetworkProxy &proxy) { - return QString("%1://%2:%3").arg(proxy.type()).arg(proxy.hostName()).arg(proxy.port()); + return QString("%1://%2:%3").arg(proxyTypeToCStr(proxy.type())).arg(proxy.hostName()).arg(proxy.port()); } void ClientProxy::setupQtProxyFromConfig() -- 2.30.2