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

Some cosmetic changes

Browse Source
This commit is contained in:
Gabriele Bartolini
2010-12-16 22:31:26 +01:00
parent 05e88a2cc8
commit f2bec9a08f
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config.c
View File

@@ -7,10 +7,12 @@
#include "repmgr.h" #include "repmgr.h"
#define MAXLINELENGTH 4096
void void
parse_config(const char *config_file, char *cluster_name, int *node, char *conninfo) parse_config(const char *config_file, char *cluster_name, int *node, char *conninfo)
{ {
char *s, buff[MAXLEN]; char *s, buff[MAXLINELENGTH];
char name[MAXLEN]; char name[MAXLEN];
char value[MAXLEN]; char value[MAXLEN];

14
dbutils.c
View File

@@ -8,6 +8,9 @@
#include "repmgr.h" #include "repmgr.h"
#define MAXQUERY 8192
#define MAXCONNINFO 1024
PGconn * PGconn *
establishDBConnection(const char *conninfo, const bool exit_on_error) establishDBConnection(const char *conninfo, const bool exit_on_error)
{ {
@@ -82,6 +85,7 @@ pg_version(PGconn *conn)
major_version2 = PQgetvalue(res, 0, 1); major_version2 = PQgetvalue(res, 0, 1);
PQclear(res); PQclear(res);
/* FIX: this is never deallocated */
major_version = malloc(10); major_version = malloc(10);
if (major_version1 >= 9) if (major_version1 >= 9)
{ {
@@ -99,7 +103,7 @@ bool
guc_setted(PGconn *conn, const char *parameter, const char *op, const char *value) guc_setted(PGconn *conn, const char *parameter, const char *op, const char *value)
{ {
PGresult *res; PGresult *res;
char sqlquery[8192]; char sqlquery[MAXQUERY];
sprintf(sqlquery, "SELECT true FROM pg_settings " sprintf(sqlquery, "SELECT true FROM pg_settings "
" WHERE name = '%s' AND setting %s '%s'", " WHERE name = '%s' AND setting %s '%s'",
@@ -129,7 +133,7 @@ get_cluster_size(PGconn *conn)
{ {
PGresult *res; PGresult *res;
const char *size; const char *size;
char sqlquery[8192]; char sqlquery[MAXQUERY];
sprintf(sqlquery, "SELECT pg_size_pretty(SUM(pg_database_size(oid))::bigint) " sprintf(sqlquery, "SELECT pg_size_pretty(SUM(pg_database_size(oid))::bigint) "
" FROM pg_database "); " FROM pg_database ");
@@ -157,8 +161,8 @@ getMasterConnection(PGconn *standby_conn, int id, char *cluster, int *master_id)
PGconn *master_conn = NULL; PGconn *master_conn = NULL;
PGresult *res1; PGresult *res1;
PGresult *res2; PGresult *res2;
char sqlquery[8192]; char sqlquery[MAXQUERY];
char master_conninfo[8192]; char master_conninfo[MAXCONNINFO];
int i; int i;
/* find all nodes belonging to this cluster */ /* find all nodes belonging to this cluster */
@@ -179,7 +183,7 @@ getMasterConnection(PGconn *standby_conn, int id, char *cluster, int *master_id)
{ {
/* initialize with the values of the current node being processed */ /* initialize with the values of the current node being processed */
*master_id = atoi(PQgetvalue(res1, i, 0)); *master_id = atoi(PQgetvalue(res1, i, 0));
strcpy(master_conninfo, PQgetvalue(res1, i, 2)); strncpy(master_conninfo, PQgetvalue(res1, i, 2), MAXCONNINFO);
master_conn = establishDBConnection(master_conninfo, false); master_conn = establishDBConnection(master_conninfo, false);
if (PQstatus(master_conn) != CONNECTION_OK) if (PQstatus(master_conn) != CONNECTION_OK)
continue; continue;