Ensure server cleanup on exit only happens if the server actually started up. Fixes #3277

pull/17/head
Akshay Joshi 2018-05-11 09:33:09 +01:00 committed by Dave Page
parent e17b62c055
commit 252a9b265b
2 changed files with 3 additions and 1 deletions

View File

@ -27,6 +27,7 @@ Bug fixes
| `Bug #3308 <https://redmine.postgresql.org/issues/3308>`_ - Fixed issue where icon for Partitioned tables was the same as Non Partitioned tables for Greenplum database
| `Bug #3310 <https://redmine.postgresql.org/issues/3310>`_ - Fixed layout of the alertify error message in the query tool
| `Bug #3238 <https://redmine.postgresql.org/issues/3238>`_ - Standardise the error handling for parsing of JSON response messages from the server
| `Bug #3277 <https://redmine.postgresql.org/issues/3277>`_ - Ensure server cleanup on exit only happens if the server actually started up.
| `Bug #3324 <https://redmine.postgresql.org/issues/3324>`_ - Fix the template loader to work reliably under Windows (fixing external tables under Greenplum)
| `Bug #3333 <https://redmine.postgresql.org/issues/3333>`_ - Ensure the runtime core application is setup before trying to access any settings
| `Bug #3342 <https://redmine.postgresql.org/issues/3342>`_ - Set SESSION_COOKIE_SAMESITE='Lax' per Flask recommendation to prevents sending cookies with CSRF-prone requests from external sites, such as submitting a form

View File

@ -237,7 +237,6 @@ int main(int argc, char * argv[])
exit(1);
}
QObject::connect(server, SIGNAL(finished()), server, SLOT(deleteLater()));
server->start();
// This is a hack to give the server a chance to start and potentially fail. As
@ -290,6 +289,8 @@ int main(int argc, char * argv[])
done = true;
}
// Ensure the server gets cleaned up later
QObject::connect(server, SIGNAL(finished()), server, SLOT(deleteLater()));
// Generate the app server URL
QString appServerUrl = QString("http://127.0.0.1:%1/?key=%2").arg(port).arg(key);