IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2026-09-03 20:52:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Modify the runtime to use time-based timeouts rather than retry based. Fixes #2556

Browse Source 
This allows for slow vs. fast connection failures (e.g. an active rejection vs. no response).
This commit is contained in:
Khushboo Vashi
2017-07-17 15:17:58 +01:00
committed by Dave Page
parent 3942461c50
commit c546182789
2 changed files with 44 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/pgAdmin4.cpp
+21 -13
View File
@@ -340,30 +340,38 @@ int main(int argc, char * argv[])
// Generate the app server URL
QString appServerUrl = QString("http://127.0.0.1:%1/?key=%2").arg(port).arg(key);
// Read the server connection timeout from the registry or set the default timeout.
QSettings settings;
int timeout = settings.value("ConnectionTimeout", 30).toInt();
// Now the server should be up, we'll attempt to connect and get a response.
// We'll retry in a loop a few time before aborting if necessary.
int attempt = 0;
while (attempt++ < 50)
QTime endTime = QTime::currentTime().addSecs(timeout);
bool alive = false;
while(QTime::currentTime() <= endTime)
{
bool alive = PingServer(QUrl(appServerUrl));
alive = PingServer(QUrl(appServerUrl));
if (alive)
{
break;
}
if (attempt == 50)
{
splash->finish(NULL);
QString error(QWidget::tr("The application server could not be contacted."));
QMessageBox::critical(NULL, QString(QWidget::tr("Fatal Error")), error);
exit(1);
}
delay(200);
}
// Attempt to connect one more time in case of a long network timeout while looping
if(!alive && !PingServer(QUrl(appServerUrl)))
{
splash->finish(NULL);
QString error(QWidget::tr("The application server could not be contacted."));
QMessageBox::critical(NULL, QString(QWidget::tr("Fatal Error")), error);
exit(1);
}
// Create & show the main window
BrowserWindow browserWindow(appServerUrl);
browserWindow.setWindowTitle(PGA_APP_NAME);
@@ -394,7 +402,7 @@ bool PingServer(QUrl url)
QNetworkReply *reply;
QVariant redirectUrl;
url.setPath("/misc/ping");
url.setPath("/misc/pingx");
do
{