github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-25 08:06:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

get_data_directory() -> get_pg_setting()

Browse Source 
More code consolidation
This commit is contained in:
Ian Barwick
2015-01-06 13:47:31 +09:00
parent 3033f2dfaf
commit 687872e979
3 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
dbutils.c
View File

@@ -278,7 +278,7 @@ get_cluster_size(PGconn *conn, char *size)
" FROM pg_database ");
res = PQexec(conn, sqlquery);
if (PQresultStatus(res) != PGRES_TUPLES_OK)
if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK)
{
log_err(_("Get cluster size PQexec failed: %s"),
PQerrorMessage(conn));
@@ -295,32 +295,52 @@ get_cluster_size(PGconn *conn, char *size)
bool
get_data_directory(PGconn *conn, char *data_directory)
get_pg_setting(PGconn *conn, const char *setting, char *output)
{
char sqlquery[QUERY_STR_LEN];
PGresult *res;
int i;
bool success = true;
sqlquery_snprintf(sqlquery,
"SELECT setting "
" FROM pg_settings WHERE name = 'data_directory'");
"SELECT name, setting "
" FROM pg_settings WHERE name = '%s'",
setting);
log_debug(_("get_data_directory(): %s\n"), sqlquery);
log_debug(_("get_pg_setting(): %s\n"), sqlquery);
res = PQexec(conn, sqlquery);
if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK || PQntuples(res) != 1)
if (res == NULL || PQresultStatus(res) != PGRES_TUPLES_OK)
{
log_err(_("get_data_directory() - PQexec failed: %s"),
log_err(_("get_pg_setting() - PQexec failed: %s"),
PQerrorMessage(conn));
PQclear(res);
return false;
}
strncpy(data_directory, PQgetvalue(res, 0, 0), MAXLEN);
log_debug(_("get_data_directory(): returned value is '%s'\n"), data_directory);
for (i = 0; i < PQntuples(res); i++)
{
if (strcmp(PQgetvalue(res, i, 0), setting) == 0)
{
strncpy(output, PQgetvalue(res, i, 1), MAXLEN);
success = true;
break;
}
else
{
log_err(_("unknown parameter: %s"), PQgetvalue(res, i, 0));
}
}
if(success == true)
{
log_debug(_("get_pg_setting(): returned value is '%s'\n"), output);
}
PQclear(res);
return true;
return success;
}