Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't show error for each re-connect attempt

This commit is contained in:
Martchus 2016-12-11 19:10:38 +01:00
parent 203370f933
commit 2b75f1f3e5
5 changed files with 93 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
connector/syncthingconnection.cpp
View File

@ -55,7 +55,8 @@ SyncthingConnection::SyncthingConnection(const QString &syncthingUrl, const QByt
m_lastEventId(0),
m_trafficPollInterval(2000),
m_devStatsPollInterval(60000),
m_reconnectTimer(),
m_autoReconnectTimer(),
m_autoReconnectTries(0),
m_totalIncomingTraffic(0),
m_totalOutgoingTraffic(0),
m_totalIncomingRate(0),
@ -70,8 +71,8 @@ SyncthingConnection::SyncthingConnection(const QString &syncthingUrl, const QByt
m_hasStatus(false),
m_lastFileDeleted(false)
{
m_reconnectTimer.setTimerType(Qt::VeryCoarseTimer);
QObject::connect(&m_reconnectTimer, &QTimer::timeout, this, static_cast<void(SyncthingConnection::*)(void)>(&SyncthingConnection::connect));
m_autoReconnectTimer.setTimerType(Qt::VeryCoarseTimer);
QObject::connect(&m_autoReconnectTimer, &QTimer::timeout, this, &SyncthingConnection::autoReconnect);
}
/*!
@ -122,11 +123,12 @@ bool SyncthingConnection::hasOutOfSyncDirs() const
*/
void SyncthingConnection::connect()
{
m_reconnectTimer.stop();
m_autoReconnectTimer.stop();
m_autoReconnectTries = 0;
if(!isConnected()) {
m_reconnecting = m_hasConfig = m_hasStatus = false;
if(m_apiKey.isEmpty() || m_syncthingUrl.isEmpty()) {
emit error(tr("Connection configuration is insufficient."));
emit error(tr("Connection configuration is insufficient."), SyncthingErrorCategory::OverallConnection);
return;
}
requestConfig();
@ -141,16 +143,20 @@ void SyncthingConnection::connect()
void SyncthingConnection::disconnect()
{
m_reconnecting = m_hasConfig = m_hasStatus = false;
m_autoReconnectTries = 0;
abortAllRequests();
}
/*!
* \brief Disconnects if connected, then (re-)connects asynchronously.
* \remarks Clears the currently cached configuration.
* \remarks
* - Clears the currently cached configuration.
* - This explicit request to reconnect will reset the autoReconnectTries().
*/
void SyncthingConnection::reconnect()
{
m_reconnectTimer.stop();
m_autoReconnectTimer.stop();
m_autoReconnectTries = 0;
if(isConnected()) {
m_reconnecting = true;
m_hasConfig = m_hasStatus = false;
@ -197,13 +203,20 @@ void SyncthingConnection::continueReconnecting()
m_lastFileName.clear();
m_lastFileDeleted = false;
if(m_apiKey.isEmpty() || m_syncthingUrl.isEmpty()) {
emit error(tr("Connection configuration is insufficient."));
emit error(tr("Connection configuration is insufficient."), SyncthingErrorCategory::OverallConnection);
return;
}
requestConfig();
requestStatus();
}
void SyncthingConnection::autoReconnect()
{
const auto tmp = m_autoReconnectTries;
connect();
m_autoReconnectTries = tmp + 1;
}
/*!
* \brief Requests pausing the device with the specified ID.
*
@ -560,7 +573,7 @@ QMetaObject::Connection SyncthingConnection::requestQrCode(const QString &text,
callback(reply->readAll());
break;
default:
emit error(tr("Unable to request QR-Code: ") + reply->errorString());
emit error(tr("Unable to request QR-Code: ") + reply->errorString(), SyncthingErrorCategory::SpecificRequest);
}
});
}
@ -589,11 +602,11 @@ QMetaObject::Connection SyncthingConnection::requestLog(std::function<void (cons
}
callback(logEntries);
} else {
emit error(tr("Unable to parse Syncthing log: ") + jsonError.errorString());
emit error(tr("Unable to parse Syncthing log: ") + jsonError.errorString(), SyncthingErrorCategory::Parsing);
}
break;
} default:
emit error(tr("Unable to request system log: ") + reply->errorString());
emit error(tr("Unable to request system log: ") + reply->errorString(), SyncthingErrorCategory::SpecificRequest);
}
});
}
@ -630,13 +643,13 @@ void SyncthingConnection::loadSelfSignedCertificate()
// find cert
const QString certPath = !m_configDir.isEmpty() ? (m_configDir + QStringLiteral("/https-cert.pem")) : SyncthingConfig::locateHttpsCertificate();
if(certPath.isEmpty()) {
emit error(tr("Unable to locate certificate used by Syncthing GUI."));
emit error(tr("Unable to locate certificate used by Syncthing GUI."), SyncthingErrorCategory::OverallConnection);
return;
}
// add exception
const QList<QSslCertificate> cert = QSslCertificate::fromPath(certPath);
if(cert.isEmpty()) {
emit error(tr("Unable to load certificate used by Syncthing GUI."));
emit error(tr("Unable to load certificate used by Syncthing GUI."), SyncthingErrorCategory::OverallConnection);
return;
}
m_expectedSslErrors.reserve(4);
@ -664,7 +677,7 @@ void SyncthingConnection::applySettings(SyncthingConnectionSettings &connectionS
}
setTrafficPollInterval(connectionSettings.trafficPollInterval);
setDevStatsPollInterval(connectionSettings.devStatsPollInterval);
setReconnectInterval(connectionSettings.reconnectInterval);
setAutoReconnectInterval(connectionSettings.reconnectInterval);
if(connectionSettings.expectedSslErrors.isEmpty()) {
loadSelfSignedCertificate();
connectionSettings.expectedSslErrors = expectedSslErrors();
@ -698,16 +711,16 @@ void SyncthingConnection::readConfig()
continueConnecting();
}
} else {
emit error(tr("Unable to parse Syncthing config: ") + jsonError.errorString());
emit error(tr("Unable to parse Syncthing config: ") + jsonError.errorString(), SyncthingErrorCategory::Parsing);
}
break;
} case QNetworkReply::OperationCanceledError:
return; // intended, not an error
default:
emit error(tr("Unable to request Syncthing config: ") + reply->errorString());
emit error(tr("Unable to request Syncthing config: ") + reply->errorString(), SyncthingErrorCategory::OverallConnection);
setStatus(SyncthingStatus::Disconnected);
if(m_reconnectTimer.interval()) {
m_reconnectTimer.start();
if(m_autoReconnectTimer.interval()) {
m_autoReconnectTimer.start();
}
}
}
@ -802,13 +815,13 @@ void SyncthingConnection::readStatus()
m_hasStatus = true;
continueConnecting();
} else {
emit error(tr("Unable to parse Syncthing status: ") + jsonError.errorString());
emit error(tr("Unable to parse Syncthing status: ") + jsonError.errorString(), SyncthingErrorCategory::Parsing);
}
break;
} case QNetworkReply::OperationCanceledError:
return; // intended, not an error
default:
emit error(tr("Unable to request Syncthing status: ") + reply->errorString());
emit error(tr("Unable to request Syncthing status: ") + reply->errorString(), SyncthingErrorCategory::OverallConnection);
}
}
@ -883,13 +896,13 @@ void SyncthingConnection::readConnections()
QTimer::singleShot(m_trafficPollInterval, Qt::VeryCoarseTimer, this, &SyncthingConnection::requestConnections);
}
} else {
emit error(tr("Unable to parse connections: ") + jsonError.errorString());
emit error(tr("Unable to parse connections: ") + jsonError.errorString(), SyncthingErrorCategory::Parsing);
}
break;
} case QNetworkReply::OperationCanceledError:
return; // intended, not an error
default:
emit error(tr("Unable to request connections: ") + reply->errorString());
emit error(tr("Unable to request connections: ") + reply->errorString(), SyncthingErrorCategory::OverallConnection);
}
}
@ -943,13 +956,13 @@ void SyncthingConnection::readDirStatistics()
++index;
}
} else {
emit error(tr("Unable to parse directory statistics: ") + jsonError.errorString());
emit error(tr("Unable to parse directory statistics: ") + jsonError.errorString(), SyncthingErrorCategory::Parsing);
}
break;
} case QNetworkReply::OperationCanceledError:
return; // intended, not an error
default:
emit error(tr("Unable to request directory statistics: ") + reply->errorString());
emit error(tr("Unable to request directory statistics: ") + reply->errorString(), SyncthingErrorCategory::OverallConnection);
}
}
@ -985,13 +998,13 @@ void SyncthingConnection::readDeviceStatistics()
QTimer::singleShot(m_devStatsPollInterval, Qt::VeryCoarseTimer, this, &SyncthingConnection::requestDeviceStatistics);
}
} else {
emit error(tr("Unable to parse device statistics: ") + jsonError.errorString());
emit error(tr("Unable to parse device statistics: ") + jsonError.errorString(), SyncthingErrorCategory::Parsing);
}
break;
} case QNetworkReply::OperationCanceledError:
return; // intended, not an error
default:
emit error(tr("Unable to request device statistics: ") + reply->errorString());
emit error(tr("Unable to request device statistics: ") + reply->errorString(), SyncthingErrorCategory::OverallConnection);
}
}
@ -1029,7 +1042,7 @@ void SyncthingConnection::readErrors()
}
}
} else {
emit error(tr("Unable to parse errors: ") + jsonError.errorString());
emit error(tr("Unable to parse errors: ") + jsonError.errorString(), SyncthingErrorCategory::Parsing);
}
// since there seems no event for this data, just request every thirty seconds, FIXME: make interval configurable
@ -1040,7 +1053,7 @@ void SyncthingConnection::readErrors()
} case QNetworkReply::OperationCanceledError:
return; // intended, not an error
default:
emit error(tr("Unable to request errors: ") + reply->errorString());
emit error(tr("Unable to request errors: ") + reply->errorString(), SyncthingErrorCategory::OverallConnection);
}
}
@ -1093,10 +1106,10 @@ void SyncthingConnection::readEvents()
}
}
} else {
emit error(tr("Unable to parse Syncthing events: ") + jsonError.errorString());
emit error(tr("Unable to parse Syncthing events: ") + jsonError.errorString(), SyncthingErrorCategory::Parsing);
setStatus(SyncthingStatus::Disconnected);
if(m_reconnectTimer.interval()) {
m_reconnectTimer.start();
if(m_autoReconnectTimer.interval()) {
m_autoReconnectTimer.start();
}
return;
}
@ -1115,10 +1128,10 @@ void SyncthingConnection::readEvents()
}
return;
default:
emit error(tr("Unable to request Syncthing events: ") + reply->errorString());
emit error(tr("Unable to request Syncthing events: ") + reply->errorString(), SyncthingErrorCategory::OverallConnection);
setStatus(SyncthingStatus::Disconnected);
if(m_reconnectTimer.interval()) {
m_reconnectTimer.start();
if(m_autoReconnectTimer.interval()) {
m_autoReconnectTimer.start();
}
return;
}
@ -1378,7 +1391,7 @@ void SyncthingConnection::readRescan()
emit rescanTriggered(reply->property("dirId").toString());
break;
default:
emit error(tr("Unable to request rescan: ") + reply->errorString());
emit error(tr("Unable to request rescan: ") + reply->errorString(), SyncthingErrorCategory::SpecificRequest);
}
}
@ -1398,7 +1411,7 @@ void SyncthingConnection::readPauseResume()
}
break;
default:
emit error(tr("Unable to request pause/resume: ") + reply->errorString());
emit error(tr("Unable to request pause/resume: ") + reply->errorString(), SyncthingErrorCategory::SpecificRequest);
}
}
@ -1414,7 +1427,7 @@ void SyncthingConnection::readRestart()
emit restartTriggered();
break;
default:
emit error(tr("Unable to request restart: ") + reply->errorString());
emit error(tr("Unable to request restart: ") + reply->errorString(), SyncthingErrorCategory::SpecificRequest);
}
}
@ -1430,7 +1443,7 @@ void SyncthingConnection::readShutdown()
emit shutdownTriggered();
break;
default:
emit error(tr("Unable to request shutdown: ") + reply->errorString());
emit error(tr("Unable to request shutdown: ") + reply->errorString(), SyncthingErrorCategory::SpecificRequest);
}
}
@ -1451,6 +1464,9 @@ void SyncthingConnection::setStatus(SyncthingStatus status)
m_syncedDirs.clear();
break;
default:
// reset reconnect tries
m_autoReconnectTries = 0;
// check whether at least one directory is scanning or synchronizing
bool scanning = false;
bool synchronizing = false;

38
connector/syncthingconnection.h
View File

@ -37,6 +37,13 @@ enum class SyncthingStatus
BeingDestroyed
};
enum class SyncthingErrorCategory
{
OverallConnection,
SpecificRequest,
Parsing
};
struct LIB_SYNCTHING_CONNECTOR_EXPORT SyncthingLogEntry
{
SyncthingLogEntry(const QString &when, const QString &message) :
@ -84,8 +91,9 @@ public:
void setTrafficPollInterval(int trafficPollInterval);
int devStatsPollInterval() const;
void setDevStatsPollInterval(int devStatsPollInterval);
int reconnectInterval() const;
void setReconnectInterval(int reconnectInterval);
int autoReconnectInterval() const;
unsigned int autoReconnectTries() const;
void setAutoReconnectInterval(int interval);
const QString &configDir() const;
const QString &myId() const;
uint64 totalIncomingTraffic() const;
@ -128,7 +136,7 @@ Q_SIGNALS:
void devStatusChanged(const SyncthingDev &dev, int index);
void downloadProgressChanged();
void newNotification(ChronoUtilities::DateTime when, const QString &message);
void error(const QString &errorMessage);
void error(const QString &errorMessage, SyncthingErrorCategory category);
void statusChanged(SyncthingStatus newStatus);
void configDirChanged(const QString &newConfigDir);
void myIdChanged(const QString &myNewId);
@ -172,6 +180,7 @@ private Q_SLOTS:
void continueConnecting();
void continueReconnecting();
void autoReconnect();
void setStatus(SyncthingStatus status);
void emitNotification(ChronoUtilities::DateTime when, const QString &message);
@ -192,7 +201,8 @@ private:
int m_lastEventId;
int m_trafficPollInterval;
int m_devStatsPollInterval;
QTimer m_reconnectTimer;
QTimer m_autoReconnectTimer;
unsigned int m_autoReconnectTries;
QString m_configDir;
QString m_myId;
uint64 m_totalIncomingTraffic;
@ -348,21 +358,29 @@ inline void SyncthingConnection::setDevStatsPollInterval(int devStatsPollInterva
* \brief Returns the reconnect interval in milliseconds.
* \remarks Default value is 0 which indicates disabled auto-reconnect.
*/
inline int SyncthingConnection::reconnectInterval() const
inline int SyncthingConnection::autoReconnectInterval() const
{
return m_reconnectTimer.interval();
return m_autoReconnectTimer.interval();
}
/*!
* \brief Returns the current number of auto-reconnect tries.
*/
inline unsigned int SyncthingConnection::autoReconnectTries() const
{
return m_autoReconnectTries;
}
/*!
* \brief Sets the reconnect interval in milliseconds.
* \remarks Default value is 0 which indicates disabled auto-reconnect.
*/
inline void SyncthingConnection::setReconnectInterval(int reconnectInterval)
inline void SyncthingConnection::setAutoReconnectInterval(int interval)
{
if(!reconnectInterval) {
m_reconnectTimer.stop();
if(!interval) {
m_autoReconnectTimer.stop();
}
m_reconnectTimer.setInterval(reconnectInterval);
m_autoReconnectTimer.setInterval(interval);
}
/*!

12
tray/gui/trayicon.cpp
View File

@ -108,10 +108,11 @@ void TrayIcon::handleSyncthingNotificationAction(const QString &action)
}
}
void TrayIcon::showInternalError(const QString &errorMsg)
void TrayIcon::showInternalError(const QString &errorMsg, SyncthingErrorCategory category)
{
const auto &settings = Settings::values();
if(settings.notifyOn.internalErrors) {
if(settings.notifyOn.internalErrors
&& (m_trayMenu.widget()->connection().autoReconnectTries() < 1 || category != SyncthingErrorCategory::OverallConnection)) {
#ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS
if(settings.dbusNotifications) {
m_internalErrorNotification.update(errorMsg);
@ -147,7 +148,12 @@ void TrayIcon::updateStatusIconAndText(SyncthingStatus status)
switch(status) {
case SyncthingStatus::Disconnected:
setIcon(m_statusIconDisconnected);
setToolTip(tr("Not connected to Syncthing"));
if(connection.autoReconnectInterval() > 0) {
setToolTip(tr("Not connected to Syncthing - trying to reconnect every %1 ms")
.arg(connection.autoReconnectInterval()));
} else {
setToolTip(tr("Not connected to Syncthing"));
}
if(settings.notifyOn.disconnect) {
#ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS
if(settings.dbusNotifications) {

3
tray/gui/trayicon.h
View File

@ -16,6 +16,7 @@ QT_FORWARD_DECLARE_CLASS(QPixmap)
namespace Data {
enum class SyncthingStatus;
enum class SyncthingErrorCategory;
}
namespace QtGui {
@ -29,7 +30,7 @@ public:
TrayMenu &trayMenu();
public slots:
void showInternalError(const QString &errorMsg);
void showInternalError(const QString &errorMsg, Data::SyncthingErrorCategory category);
void showSyncthingNotification(ChronoUtilities::DateTime when, const QString &message);
void updateStatusIconAndText(Data::SyncthingStatus status);

1
tray/gui/traywidget.cpp
View File

@ -340,7 +340,6 @@ void TrayWidget::applySettings()
instance->m_connectionsMenu->actions().at(0)->setChecked(true);
}
instance->m_ui->connectionsPushButton->setText(instance->m_selectedConnection->label);
instance->m_connection.reconnect(*instance->m_selectedConnection);
// web view