pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add more proxy logging

Browse source
This commit is contained in:
Martin Rotter 2021-09-02 11:12:33 +02:00
parent d511ed21e5
commit afd999194e
5 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View file

@ -30,7 +30,7 @@
<url type="donation">https://martinrotter.github.io/donate/</url> <url type="donation">https://martinrotter.github.io/donate/</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="4.0.0" date="2021-08-31"/> <release version="4.0.0" date="2021-09-02"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

1
src/librssguard/definitions/definitions.h
View file

@ -311,6 +311,7 @@
#define NONQUOTE_W_SPACE_DOT(x) " " << (x) << "." #define NONQUOTE_W_SPACE_DOT(x) " " << (x) << "."
#define QUOTE_W_SPACE_DOT(x) " '" << (x) << "'." #define QUOTE_W_SPACE_DOT(x) " '" << (x) << "'."
#define QUOTE_W_SPACE_COMMA(x) " '" << (x) << "',"
#define QUOTE_W_SPACE(x) " '" << (x) << "' " #define QUOTE_W_SPACE(x) " '" << (x) << "' "
#define QUOTE_NO_SPACE(x) "'" << (x) << "'" #define QUOTE_NO_SPACE(x) "'" << (x) << "'"

11
src/librssguard/network-web/basenetworkaccessmanager.cpp
View file

@ -26,6 +26,17 @@ void BaseNetworkAccessManager::loadSettings() {
setProxy(QNetworkProxy::ProxyType::NoProxy); setProxy(QNetworkProxy::ProxyType::NoProxy);
} }
else { else {
qWarningNN << LOGSEC_NETWORK << "Using application-wide proxy.";
if (QNetworkProxy::applicationProxy().type() != QNetworkProxy::ProxyType::DefaultProxy &&
QNetworkProxy::applicationProxy().type() != QNetworkProxy::ProxyType::NoProxy) {
qWarningNN << LOGSEC_NETWORK
<< "Used proxy address:"
<< QUOTE_W_SPACE_COMMA(QNetworkProxy::applicationProxy().hostName())
<< " type:"
<< QUOTE_W_SPACE_DOT(QNetworkProxy::applicationProxy().type());
}
setProxy(QNetworkProxy::applicationProxy()); setProxy(QNetworkProxy::applicationProxy());
} }

6
src/librssguard/network-web/downloader.cpp
View file

@ -296,7 +296,11 @@ QVariant Downloader::lastContentType() const {
} }
void Downloader::setProxy(const QNetworkProxy& proxy) { void Downloader::setProxy(const QNetworkProxy& proxy) {
qWarningNN << LOGSEC_NETWORK << "Setting custom proxy:" << QUOTE_W_SPACE_DOT(proxy.hostName()); qWarningNN << LOGSEC_NETWORK
<< "Setting specific downloader proxy, address:"
<< QUOTE_W_SPACE_COMMA(proxy.hostName())
<< " type:"
<< QUOTE_W_SPACE_DOT(proxy.type());
m_downloadManager->setProxy(proxy); m_downloadManager->setProxy(proxy);
} }

13
src/librssguard/network-web/webfactory.cpp
View file

@ -222,10 +222,13 @@ void WebFactory::updateProxy() {
toInt()); toInt());
if (selected_proxy_type == QNetworkProxy::NoProxy) { if (selected_proxy_type == QNetworkProxy::NoProxy) {
qDebugNN << LOGSEC_NETWORK << "Disabling application-wide proxy completely.";
QNetworkProxyFactory::setUseSystemConfiguration(false); QNetworkProxyFactory::setUseSystemConfiguration(false);
QNetworkProxy::setApplicationProxy(QNetworkProxy::NoProxy); QNetworkProxy::setApplicationProxy(QNetworkProxy::ProxyType::NoProxy);
} }
else if (selected_proxy_type == QNetworkProxy::DefaultProxy) { else if (selected_proxy_type == QNetworkProxy::ProxyType::DefaultProxy) {
qDebugNN << LOGSEC_NETWORK << "Using application-wide proxy to be system's default proxy.";
QNetworkProxyFactory::setUseSystemConfiguration(true); QNetworkProxyFactory::setUseSystemConfiguration(true);
} }
else { else {
@ -239,6 +242,12 @@ void WebFactory::updateProxy() {
new_proxy.setUser(settings->value(GROUP(Proxy), SETTING(Proxy::Username)).toString()); new_proxy.setUser(settings->value(GROUP(Proxy), SETTING(Proxy::Username)).toString());
new_proxy.setPassword(settings->password(GROUP(Proxy), SETTING(Proxy::Password)).toString()); new_proxy.setPassword(settings->password(GROUP(Proxy), SETTING(Proxy::Password)).toString());
qWarningNN << LOGSEC_NETWORK
<< "Activating application-wide custom proxy, address:"
<< QUOTE_W_SPACE_COMMA(new_proxy.hostName())
<< " type:"
<< QUOTE_W_SPACE_DOT(new_proxy.type());
QNetworkProxy::setApplicationProxy(new_proxy); QNetworkProxy::setApplicationProxy(new_proxy);
} }
} }