sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-26 00:02:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add connect timeout for Postgres NOTIFY Listener

Browse Source
This commit is contained in:
MorriganR 2021-03-09 00:31:15 +02:00 committed by Nyall Dawson
parent c4346f92e2
commit dcf20494f2
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/providers/postgres/qgspostgreslistener.cpp
View File

@ -26,6 +26,8 @@
#include <sys/select.h>
#endif
const int PG_CONNECT_TIMEOUT = 30;
extern "C"
{
#include <libpq-fe.h>
@ -59,12 +61,14 @@ QgsPostgresListener::~QgsPostgresListener()
void QgsPostgresListener::run()
{
PGconn *conn = nullptr;
QString connectString = mConnString;
conn = PQconnectdb( mConnString.toUtf8() );
connectString += QStringLiteral( " connect_timeout=%1" ).arg( PG_CONNECT_TIMEOUT );
conn = PQconnectdb( connectString.toUtf8() );
if ( PQstatus( conn ) != CONNECTION_OK )
{
QgsDataSourceUri uri( mConnString );
QgsDataSourceUri uri( connectString );
QString username = uri.username();
QString password = uri.password();
@ -74,13 +78,11 @@ void QgsPostgresListener::run()
if ( QgsCredentials::instance()->get( mConnString, username, password, PQerrorMessage( conn ) ) )
{
if ( !username.isEmpty() )
uri.setUsername( username );
uri.setUsername( username );
uri.setPassword( password );
connectString = uri.connectionInfo( false );
connectString += QStringLiteral( " connect_timeout=%1" ).arg( PG_CONNECT_TIMEOUT );
if ( !password.isEmpty() )
uri.setPassword( password );
QString connectString = uri.connectionInfo( false );
conn = PQconnectdb( connectString.toUtf8() );
if ( PQstatus( conn ) == CONNECTION_OK )
QgsCredentials::instance()->put( mConnString, username, password );
@ -90,6 +92,7 @@ void QgsPostgresListener::run()
if ( PQstatus( conn ) != CONNECTION_OK )
{
PQfinish( conn );
QgsDebugMsg( QStringLiteral( "LISTENer not started" ) );
return;
}