tomasz.sowa/winix
1
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

allow to use db_hostaddr, db_port or db_conn_string config parameters to connect to PostgreSQL

Browse Source
This commit is contained in:
Tomasz Sowa
2022-04-20 18:37:52 +02:00
parent 7a115a3970
commit aae93d018b
6 changed files with 68 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
winixd/core/app.cpp
View File

@@ -334,7 +334,11 @@ bool App::TryToMakeDatabaseMigration()
bool App::Init()
{
postgresql_connector.set_conn_param(config.db_database, config.db_user, config.db_pass);
if( !config.db_conn_string.empty() )
postgresql_connector.set_conn_param(config.db_conn_string);
else
postgresql_connector.set_conn_param(config.db_hostaddr, config.db_port, config.db_database, config.db_user, config.db_pass);
postgresql_connector.set_logger(log);
postgresql_connector.set_log_queries(config.log_db_query);
postgresql_connector.wait_for_connection();
@@ -359,7 +363,12 @@ bool App::Init()
if( !TryToMakeDatabaseMigration() )
return false;
db_conn.SetConnParam(config.db_database, config.db_user, config.db_pass);
// will be removed
if( !config.db_conn_string.empty() )
db_conn.SetConnParam(config.db_conn_string);
else
db_conn.SetConnParam(config.db_hostaddr, config.db_port, config.db_database, config.db_user, config.db_pass);
db_conn.WaitForConnection();
db.LogQueries(config.log_db_query);