Muldersoft/MUtilities
Muldersoft/MUtilities
1
0
Fork 0
Code Releases Activity

Make sure we won't loop the list of remaining hosts more then once.

Browse Source
This commit is contained in:
LoRd_MuldeR 2018-10-21 12:28:14 +02:00
parent f63456766f
commit fe90a2c688
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/UpdateChecker.cpp
View File

@ -228,13 +228,10 @@ void MUtils::UpdateChecker::checkForUpdates(void)
{ {
QElapsedTimer elapsedTimer; QElapsedTimer elapsedTimer;
elapsedTimer.start(); elapsedTimer.start();
const qint64 globalTimeout = 2 * MIN_CONNSCORE * connectionTimeout; const int globalTimeout = 2 * MIN_CONNSCORE * connectionTimeout, count = mirrorList.count();
forever for(int i = 0; i < count; ++i)
{ {
if (mirrorList.isEmpty()) Q_ASSERT(!mirrorList.isEmpty());
{
goto endLoop; /*depleted!*/
}
const QString hostName = mirrorList.dequeue(); const QString hostName = mirrorList.dequeue();
if (tryContactHost(hostName, connectionTimeout)) if (tryContactHost(hostName, connectionTimeout))
{ {
@ -318,10 +315,10 @@ endLoop:
void MUtils::UpdateChecker::testMirrorsList(void) void MUtils::UpdateChecker::testMirrorsList(void)
{ {
QStringList mirrorList; QQueue<QString> mirrorList;
for(int i = 0; update_mirrors[i]; i++) for(int i = 0; update_mirrors[i]; i++)
{ {
mirrorList << QString::fromLatin1(update_mirrors[i]); mirrorList.enqueue(QString::fromLatin1(update_mirrors[i]));
} }
// ----- Test update mirrors ----- // // ----- Test update mirrors ----- //
@ -332,10 +329,10 @@ void MUtils::UpdateChecker::testMirrorsList(void)
UpdateCheckerInfo updateInfo; UpdateCheckerInfo updateInfo;
while (!mirrorList.isEmpty()) while (!mirrorList.isEmpty())
{ {
const QString currentMirror = mirrorList.takeFirst(); const QString currentMirror = mirrorList.dequeue();
bool success = false; bool success = false;
qDebug("Testing: %s", MUTILS_L1STR(currentMirror)); qDebug("Testing: %s", MUTILS_L1STR(currentMirror));
log("", "Testing:", currentMirror, ""); log("", "Testing mirror:", currentMirror, "");
for (quint8 attempt = 0; attempt < 3; ++attempt) for (quint8 attempt = 0; attempt < 3; ++attempt)
{ {
updateInfo.resetInfo(); updateInfo.resetInfo();
@ -354,20 +351,20 @@ void MUtils::UpdateChecker::testMirrorsList(void)
// ----- Test known hosts ----- // // ----- Test known hosts ----- //
QStringList knownHostList; mirrorList.clear();
for (int i = 0; known_hosts[i]; i++) for (int i = 0; known_hosts[i]; i++)
{ {
knownHostList << QString::fromLatin1(known_hosts[i]); mirrorList.enqueue(QString::fromLatin1(known_hosts[i]));
} }
qDebug("\n[Known Hosts]"); qDebug("\n[Known Hosts]");
log("Testing all known hosts...", "", "---"); log("Testing all known hosts...", "", "---");
while(!knownHostList.isEmpty()) while(!mirrorList.isEmpty())
{ {
const QString currentHost = knownHostList.takeFirst(); const QString currentHost = mirrorList.dequeue();
qDebug("Testing: %s", MUTILS_L1STR(currentHost)); qDebug("Testing: %s", MUTILS_L1STR(currentHost));
log(QLatin1String(""), "Testing:", currentHost, ""); log(QLatin1String(""), "Testing host:", currentHost, "");
if (!tryContactHost(currentHost, DOWNLOAD_TIMEOUT)) if (!tryContactHost(currentHost, DOWNLOAD_TIMEOUT))
{ {
qWarning("\nConnectivity test FAILED on the following host:\n%s\n", MUTILS_L1STR(currentHost)); qWarning("\nConnectivity test FAILED on the following host:\n%s\n", MUTILS_L1STR(currentHost));