kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 04:11:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "cdr_pgsql: fix error in connection string"

Browse Source
This commit is contained in:
Friendly Automation
2019-06-11 08:03:09 -05:00
committed by Gerrit Code Review
parent bcaa01b024 e61f2af89d
commit b088a17892
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cdr/cdr_pgsql.c
View File

@@ -184,15 +184,27 @@ static void pgsql_reconnect(void)
conn = NULL;
}
ast_str_set(&conn_info, 0, "host=%s port=%s dbname=%s user=%s",
pghostname, pgdbport, pgdbname, pgdbuser);
if (!ast_strlen_zero(pgappname)) {
ast_str_append(&conn_info, 0, " application_name=%s", pgappname);
if (!ast_strlen_zero(pghostname)) {
ast_str_append(&conn_info, 0, "host=%s ", pghostname);
}
if (!ast_strlen_zero(pgdbport)) {
ast_str_append(&conn_info, 0, "port=%s ", pgdbport);
}
if (!ast_strlen_zero(pgdbname)) {
ast_str_append(&conn_info, 0, "dbname=%s ", pgdbname);
}
if (!ast_strlen_zero(pgdbuser)) {
ast_str_append(&conn_info, 0, "user=%s ", pgdbuser);
}
if (!ast_strlen_zero(pgappname)) {
ast_str_append(&conn_info, 0, "application_name=%s ", pgappname);
}
if (!ast_strlen_zero(pgpassword)) {
ast_str_append(&conn_info, 0, " password=%s", pgpassword);
ast_str_append(&conn_info, 0, "password=%s", pgpassword);
}
if (ast_str_strlen(conn_info) == 0) {
ast_log(LOG_ERROR, "Connection string is blank.\n");
return;
}
conn = PQconnectdb(ast_str_buffer(conn_info));