github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 16:46:28 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

use struct for config file information

Browse Source
This commit is contained in:
trbs
2011-01-07 01:36:46 +01:00
parent 4a0e827464
commit fc2405f17d
5 changed files with 92 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
config.c
View File

@@ -22,7 +22,7 @@
#define MAXLINELENGTH 4096 #define MAXLINELENGTH 4096
void void
parse_config(const char *config_file, char *cluster_name, int *node, char *conninfo) parse_config(const char *config_file, repmgr_config *config)
{ {
char *s, buff[MAXLINELENGTH]; char *s, buff[MAXLINELENGTH];
char name[MAXLEN]; char name[MAXLEN];
@@ -30,9 +30,16 @@ parse_config(const char *config_file, char *cluster_name, int *node, char *conni
FILE *fp = fopen (config_file, "r"); FILE *fp = fopen (config_file, "r");
if (fp == NULL) if (fp == NULL) {
return; fprintf(stderr, _("Could not find configuration file '%s'\n"), config_file);
exit(1);
}
/* Initialize */
memset(config->cluster_name, 0, sizeof(config->cluster_name));
config->node = -1;
memset(config->conninfo, 0, sizeof(config->conninfo));
/* Read next line */ /* Read next line */
while ((s = fgets (buff, sizeof buff, fp)) != NULL) while ((s = fgets (buff, sizeof buff, fp)) != NULL)
{ {
@@ -45,18 +52,32 @@ parse_config(const char *config_file, char *cluster_name, int *node, char *conni
/* Copy into correct entry in parameters struct */ /* Copy into correct entry in parameters struct */
if (strcmp(name, "cluster") == 0) if (strcmp(name, "cluster") == 0)
strncpy (cluster_name, value, MAXLEN); strncpy (config->cluster_name, value, MAXLEN);
else if (strcmp(name, "node") == 0) else if (strcmp(name, "node") == 0)
*node = atoi(value); config->node = atoi(value);
else if (strcmp(name, "conninfo") == 0) else if (strcmp(name, "conninfo") == 0)
strncpy (conninfo, value, MAXLEN); strncpy (config->conninfo, value, MAXLEN);
else else
printf ("WARNING: %s/%s: Unknown name/value pair!\n", name, value); printf ("WARNING: %s/%s: Unknown name/value pair!\n", name, value);
} }
/* Close file */ /* Close file */
fclose (fp); fclose (fp);
/* Check config settings */
if (strnlen(config->cluster_name, MAXLEN)==0)
{
fprintf(stderr, "Cluster name is missing. "
"Check the configuration file.\n");
exit(1);
}
if (config->node == -1)
{
fprintf(stderr, "Node information is missing. "
"Check the configuration file.\n");
exit(1);
}
} }
char * char *

9
config.h
View File

@@ -17,6 +17,13 @@
* *
*/ */
void parse_config(const char *config_file, char *cluster_name, int *node, char *service); typedef struct
{
char cluster_name[MAXLEN];
int node;
char conninfo[MAXLEN];
} repmgr_config;
void parse_config(const char *config_file, repmgr_config *config);
void parse_line(char *buff, char *name, char *value); void parse_line(char *buff, char *name, char *value);
char *trim(char *s); char *trim(char *s);

124
repmgr.c
View File

@@ -43,8 +43,6 @@
#define STANDBY_PROMOTE 4 #define STANDBY_PROMOTE 4
#define STANDBY_FOLLOW 5 #define STANDBY_FOLLOW 5
#define QUERY_STR_LEN 8192
static void help(const char *progname); static void help(const char *progname);
static bool create_recovery_file(const char *data_dir); static bool create_recovery_file(const char *data_dir);
static int copy_remote_files(char *host, char *remote_user, char *remote_path, char *local_path, bool is_directory); static int copy_remote_files(char *host, char *remote_user, char *remote_path, char *local_path, bool is_directory);
@@ -77,6 +75,7 @@ char *masterport = NULL;
char *server_mode = NULL; char *server_mode = NULL;
char *server_cmd = NULL; char *server_cmd = NULL;
repmgr_config config = {};
int int
main(int argc, char **argv) main(int argc, char **argv)
@@ -253,6 +252,17 @@ main(int argc, char **argv)
else else
dbname = "postgres"; dbname = "postgres";
} }
/*
* Read the configuration file: repmgr.conf
*/
parse_config(config_file, &config);
if (config.node == -1)
{
fprintf(stderr, "Node information is missing. "
"Check the configuration file.\n");
exit(1);
}
keywords[2] = "user"; keywords[2] = "user";
values[2] = username; values[2] = username;
@@ -296,25 +306,10 @@ do_master_register(void)
PGresult *res; PGresult *res;
char sqlquery[QUERY_STR_LEN]; char sqlquery[QUERY_STR_LEN];
char myClusterName[MAXLEN];
int myLocalId = -1;
char conninfo[MAXLEN];
bool schema_exists = false; bool schema_exists = false;
char master_version[MAXVERSIONSTR]; char master_version[MAXVERSIONSTR];
/* conn = establishDBConnection(config.conninfo, true);
* Read the configuration file: repmgr.conf
*/
parse_config(config_file, myClusterName, &myLocalId, conninfo);
if (myLocalId == -1)
{
fprintf(stderr, "Node information is missing. "
"Check the configuration file.\n");
exit(1);
}
conn = establishDBConnection(conninfo, true);
/* master should be v9 or better */ /* master should be v9 or better */
pg_version(conn, master_version); pg_version(conn, master_version);
@@ -334,7 +329,7 @@ do_master_register(void)
} }
/* Check if there is a schema for this cluster */ /* Check if there is a schema for this cluster */
sprintf(sqlquery, "SELECT 1 FROM pg_namespace WHERE nspname = 'repmgr_%s'", myClusterName); sprintf(sqlquery, "SELECT 1 FROM pg_namespace WHERE nspname = 'repmgr_%s'", config.cluster_name);
res = PQexec(conn, sqlquery); res = PQexec(conn, sqlquery);
if (PQresultStatus(res) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
{ {
@@ -348,7 +343,7 @@ do_master_register(void)
{ {
if (!force) /* and we are not forcing so error */ if (!force) /* and we are not forcing so error */
{ {
fprintf(stderr, "Schema repmgr_%s already exists.", myClusterName); fprintf(stderr, "Schema repmgr_%s already exists.", config.cluster_name);
PQclear(res); PQclear(res);
PQfinish(conn); PQfinish(conn);
return; return;
@@ -360,11 +355,11 @@ do_master_register(void)
if (!schema_exists) if (!schema_exists)
{ {
/* ok, create the schema */ /* ok, create the schema */
sprintf(sqlquery, "CREATE SCHEMA repmgr_%s", myClusterName); sprintf(sqlquery, "CREATE SCHEMA repmgr_%s", config.cluster_name);
if (!PQexec(conn, sqlquery)) if (!PQexec(conn, sqlquery))
{ {
fprintf(stderr, "Cannot create the schema repmgr_%s: %s\n", fprintf(stderr, "Cannot create the schema repmgr_%s: %s\n",
myClusterName, PQerrorMessage(conn)); config.cluster_name, PQerrorMessage(conn));
PQfinish(conn); PQfinish(conn);
return; return;
} }
@@ -373,11 +368,11 @@ do_master_register(void)
sprintf(sqlquery, "CREATE TABLE repmgr_%s.repl_nodes ( " sprintf(sqlquery, "CREATE TABLE repmgr_%s.repl_nodes ( "
" id integer primary key, " " id integer primary key, "
" cluster text not null, " " cluster text not null, "
" conninfo text not null)", myClusterName); " conninfo text not null)", config.cluster_name);
if (!PQexec(conn, sqlquery)) if (!PQexec(conn, sqlquery))
{ {
fprintf(stderr, "Cannot create the table repmgr_%s.repl_nodes: %s\n", fprintf(stderr, "Cannot create the table repmgr_%s.repl_nodes: %s\n",
myClusterName, PQerrorMessage(conn)); config.cluster_name, PQerrorMessage(conn));
PQfinish(conn); PQfinish(conn);
return; return;
} }
@@ -389,11 +384,11 @@ do_master_register(void)
" last_wal_primary_location TEXT NOT NULL, " " last_wal_primary_location TEXT NOT NULL, "
" last_wal_standby_location TEXT NOT NULL, " " last_wal_standby_location TEXT NOT NULL, "
" replication_lag BIGINT NOT NULL, " " replication_lag BIGINT NOT NULL, "
" apply_lag BIGINT NOT NULL) ", myClusterName); " apply_lag BIGINT NOT NULL) ", config.cluster_name);
if (!PQexec(conn, sqlquery)) if (!PQexec(conn, sqlquery))
{ {
fprintf(stderr, "Cannot create the table repmgr_%s.repl_monitor: %s\n", fprintf(stderr, "Cannot create the table repmgr_%s.repl_monitor: %s\n",
myClusterName, PQerrorMessage(conn)); config.cluster_name, PQerrorMessage(conn));
PQfinish(conn); PQfinish(conn);
return; return;
} }
@@ -407,11 +402,11 @@ do_master_register(void)
" last_wal_standby_location, pg_size_pretty(replication_lag) replication_lag, " " last_wal_standby_location, pg_size_pretty(replication_lag) replication_lag, "
" pg_size_pretty(apply_lag) apply_lag, age(now(), last_monitor_time) AS time_lag " " pg_size_pretty(apply_lag) apply_lag, age(now(), last_monitor_time) AS time_lag "
" FROM monitor_info a " " FROM monitor_info a "
" WHERE row_number = 1", myClusterName, myClusterName); " WHERE row_number = 1", config.cluster_name, config.cluster_name);
if (!PQexec(conn, sqlquery)) if (!PQexec(conn, sqlquery))
{ {
fprintf(stderr, "Cannot create the view repmgr_%s.repl_status: %s\n", fprintf(stderr, "Cannot create the view repmgr_%s.repl_status: %s\n",
myClusterName, PQerrorMessage(conn)); config.cluster_name, PQerrorMessage(conn));
PQfinish(conn); PQfinish(conn);
return; return;
} }
@@ -422,7 +417,7 @@ do_master_register(void)
int id; int id;
/* Ensure there isn't any other master already registered */ /* Ensure there isn't any other master already registered */
master_conn = getMasterConnection(conn, myLocalId, myClusterName, &id); master_conn = getMasterConnection(conn, config.node, config.cluster_name, &id);
if (master_conn != NULL) if (master_conn != NULL)
{ {
PQfinish(master_conn); PQfinish(master_conn);
@@ -436,7 +431,7 @@ do_master_register(void)
{ {
sprintf(sqlquery, "DELETE FROM repmgr_%s.repl_nodes " sprintf(sqlquery, "DELETE FROM repmgr_%s.repl_nodes "
" WHERE id = %d", " WHERE id = %d",
myClusterName, myLocalId); config.cluster_name, config.node);
if (!PQexec(conn, sqlquery)) if (!PQexec(conn, sqlquery))
{ {
@@ -449,7 +444,7 @@ do_master_register(void)
sprintf(sqlquery, "INSERT INTO repmgr_%s.repl_nodes " sprintf(sqlquery, "INSERT INTO repmgr_%s.repl_nodes "
"VALUES (%d, '%s', '%s')", "VALUES (%d, '%s', '%s')",
myClusterName, myLocalId, myClusterName, conninfo); config.cluster_name, config.node, config.cluster_name, config.conninfo);
if (!PQexec(conn, sqlquery)) if (!PQexec(conn, sqlquery))
{ {
@@ -474,25 +469,10 @@ do_standby_register(void)
PGresult *res; PGresult *res;
char sqlquery[QUERY_STR_LEN]; char sqlquery[QUERY_STR_LEN];
char myClusterName[MAXLEN];
int myLocalId = -1;
char conninfo[MAXLEN];
char master_version[MAXVERSIONSTR]; char master_version[MAXVERSIONSTR];
char standby_version[MAXVERSIONSTR]; char standby_version[MAXVERSIONSTR];
/* conn = establishDBConnection(config.conninfo, true);
* Read the configuration file: repmgr.conf
*/
parse_config(config_file, myClusterName, &myLocalId, conninfo);
if (myLocalId == -1)
{
fprintf(stderr, "Node information is missing. "
"Check the configuration file.\n");
exit(1);
}
conn = establishDBConnection(conninfo, true);
/* should be v9 or better */ /* should be v9 or better */
pg_version(conn, standby_version); pg_version(conn, standby_version);
@@ -512,7 +492,7 @@ do_standby_register(void)
} }
/* Check if there is a schema for this cluster */ /* Check if there is a schema for this cluster */
sprintf(sqlquery, "SELECT 1 FROM pg_namespace WHERE nspname = 'repmgr_%s'", myClusterName); sprintf(sqlquery, "SELECT 1 FROM pg_namespace WHERE nspname = 'repmgr_%s'", config.cluster_name);
res = PQexec(conn, sqlquery); res = PQexec(conn, sqlquery);
if (PQresultStatus(res) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
{ {
@@ -524,7 +504,7 @@ do_standby_register(void)
if (PQntuples(res) == 0) /* schema doesn't exists */ if (PQntuples(res) == 0) /* schema doesn't exists */
{ {
fprintf(stderr, "Schema repmgr_%s doesn't exists.", myClusterName); fprintf(stderr, "Schema repmgr_%s doesn't exists.", config.cluster_name);
PQclear(res); PQclear(res);
PQfinish(conn); PQfinish(conn);
return; return;
@@ -532,7 +512,7 @@ do_standby_register(void)
PQclear(res); PQclear(res);
/* check if there is a master in this cluster */ /* check if there is a master in this cluster */
master_conn = getMasterConnection(conn, myLocalId, myClusterName, &master_id); master_conn = getMasterConnection(conn, config.node, config.cluster_name, &master_id);
if (!master_conn) if (!master_conn)
return; return;
@@ -562,7 +542,7 @@ do_standby_register(void)
{ {
sprintf(sqlquery, "DELETE FROM repmgr_%s.repl_nodes " sprintf(sqlquery, "DELETE FROM repmgr_%s.repl_nodes "
" WHERE id = %d", " WHERE id = %d",
myClusterName, myLocalId); config.cluster_name, config.node);
if (!PQexec(master_conn, sqlquery)) if (!PQexec(master_conn, sqlquery))
{ {
@@ -576,7 +556,7 @@ do_standby_register(void)
sprintf(sqlquery, "INSERT INTO repmgr_%s.repl_nodes " sprintf(sqlquery, "INSERT INTO repmgr_%s.repl_nodes "
"VALUES (%d, '%s', '%s')", "VALUES (%d, '%s', '%s')",
myClusterName, myLocalId, myClusterName, conninfo); config.cluster_name, config.node, config.cluster_name, config.conninfo);
if (!PQexec(master_conn, sqlquery)) if (!PQexec(master_conn, sqlquery))
{ {
@@ -970,10 +950,6 @@ do_standby_promote(void)
char sqlquery[QUERY_STR_LEN]; char sqlquery[QUERY_STR_LEN];
char script[QUERY_STR_LEN]; char script[QUERY_STR_LEN];
char myClusterName[MAXLEN];
int myLocalId = -1;
char conninfo[MAXLEN];
PGconn *old_master_conn; PGconn *old_master_conn;
int old_master_id; int old_master_id;
@@ -984,19 +960,8 @@ do_standby_promote(void)
char standby_version[MAXVERSIONSTR]; char standby_version[MAXVERSIONSTR];
/*
* Read the configuration file: repmgr.conf
*/
parse_config(config_file, myClusterName, &myLocalId, conninfo);
if (myLocalId == -1)
{
fprintf(stderr, "Node information is missing. "
"Check the configuration file.\n");
exit(1);
}
/* We need to connect to check configuration */ /* We need to connect to check configuration */
conn = establishDBConnection(conninfo, true); conn = establishDBConnection(config.conninfo, true);
/* we need v9 or better */ /* we need v9 or better */
pg_version(conn, standby_version); pg_version(conn, standby_version);
@@ -1015,7 +980,7 @@ do_standby_promote(void)
} }
/* we also need to check if there isn't any master already */ /* we also need to check if there isn't any master already */
old_master_conn = getMasterConnection(conn, myLocalId, myClusterName, &old_master_id); old_master_conn = getMasterConnection(conn, config.node, config.cluster_name, &old_master_id);
if (old_master_conn != NULL) if (old_master_conn != NULL)
{ {
PQfinish(old_master_conn); PQfinish(old_master_conn);
@@ -1058,7 +1023,7 @@ do_standby_promote(void)
/* /*
* XXX i'm removing this because it gives an annoying message saying couldn't connect * XXX i'm removing this because it gives an annoying message saying couldn't connect
* but is just the server starting up * but is just the server starting up
* conn = establishDBConnection(conninfo, true); * conn = establishDBConnection(config.conninfo, true);
* if (is_standby(conn)) * if (is_standby(conn))
* fprintf(stderr, "\n%s: STANDBY PROMOTE failed, this is still a standby node.\n", progname); * fprintf(stderr, "\n%s: STANDBY PROMOTE failed, this is still a standby node.\n", progname);
* else * else
@@ -1078,10 +1043,6 @@ do_standby_follow(void)
char sqlquery[QUERY_STR_LEN]; char sqlquery[QUERY_STR_LEN];
char script[QUERY_STR_LEN]; char script[QUERY_STR_LEN];
char myClusterName[MAXLEN];
int myLocalId = -1;
char conninfo[MAXLEN];
PGconn *master_conn; PGconn *master_conn;
int master_id; int master_id;
@@ -1091,19 +1052,8 @@ do_standby_follow(void)
char master_version[MAXVERSIONSTR]; char master_version[MAXVERSIONSTR];
char standby_version[MAXVERSIONSTR]; char standby_version[MAXVERSIONSTR];
/*
* Read the configuration file: repmgr.conf
*/
parse_config(config_file, myClusterName, &myLocalId, conninfo);
if (myLocalId == -1)
{
fprintf(stderr, "Node information is missing. "
"Check the configuration file.\n");
exit(1);
}
/* We need to connect to check configuration */ /* We need to connect to check configuration */
conn = establishDBConnection(conninfo, true); conn = establishDBConnection(config.conninfo, true);
/* Check we are in a standby node */ /* Check we are in a standby node */
if (!is_standby(conn)) if (!is_standby(conn))
@@ -1122,7 +1072,7 @@ do_standby_follow(void)
} }
/* we also need to check if there is any master in the cluster */ /* we also need to check if there is any master in the cluster */
master_conn = getMasterConnection(conn, myLocalId, myClusterName, &master_id); master_conn = getMasterConnection(conn, config.node, config.cluster_name, &master_id);
if (master_conn == NULL) if (master_conn == NULL)
{ {
PQfinish(conn); PQfinish(conn);

4
repmgr.h
View File

@@ -25,7 +25,6 @@
#include "libpq-fe.h" #include "libpq-fe.h"
#include "dbutils.h" #include "dbutils.h"
#include "config.h"
#define PRIMARY_MODE 0 #define PRIMARY_MODE 0
@@ -34,5 +33,8 @@
#define MAXLEN 80 #define MAXLEN 80
#define CONFIG_FILE "repmgr.conf" #define CONFIG_FILE "repmgr.conf"
#define MAXVERSIONSTR 16 #define MAXVERSIONSTR 16
#define QUERY_STR_LEN 8192
#include "config.h"
#endif #endif

32
repmgrd.c
View File

@@ -30,11 +30,8 @@
#include "libpq/pqsignal.h" #include "libpq/pqsignal.h"
char myClusterName[MAXLEN];
/* Local info */ /* Local info */
int myLocalMode = STANDBY_MODE; int myLocalMode = STANDBY_MODE;
int myLocalId = -1;
PGconn *myLocalConn; PGconn *myLocalConn;
/* Primary info */ /* Primary info */
@@ -49,6 +46,8 @@ const char *progname;
char *config_file = NULL; char *config_file = NULL;
bool verbose = false; bool verbose = false;
// should initialize with {0} to be ANSI complaint ? but this raises error with gcc -Wall
repmgr_config config = {};
static void help(const char *progname); static void help(const char *progname);
static void checkClusterConfiguration(void); static void checkClusterConfiguration(void);
@@ -94,7 +93,6 @@ main(int argc, char **argv)
int optindex; int optindex;
int c; int c;
char conninfo[MAXLEN];
char standby_version[MAXVERSIONSTR]; char standby_version[MAXVERSIONSTR];
progname = get_progname(argv[0]); progname = get_progname(argv[0]);
@@ -141,15 +139,15 @@ main(int argc, char **argv)
/* /*
* Read the configuration file: repmgr.conf * Read the configuration file: repmgr.conf
*/ */
parse_config(config_file, myClusterName, &myLocalId, conninfo); parse_config(config_file, &config);
if (myLocalId == -1) if (config.node == -1)
{ {
fprintf(stderr, "Node information is missing. " fprintf(stderr, "Node information is missing. "
"Check the configuration file.\n"); "Check the configuration file.\n");
exit(1); exit(1);
} }
myLocalConn = establishDBConnection(conninfo, true); myLocalConn = establishDBConnection(config.conninfo, true);
/* should be v9 or better */ /* should be v9 or better */
pg_version(myLocalConn, standby_version); pg_version(myLocalConn, standby_version);
@@ -167,20 +165,20 @@ main(int argc, char **argv)
myLocalMode = is_standby(myLocalConn) ? STANDBY_MODE : PRIMARY_MODE; myLocalMode = is_standby(myLocalConn) ? STANDBY_MODE : PRIMARY_MODE;
if (myLocalMode == PRIMARY_MODE) if (myLocalMode == PRIMARY_MODE)
{ {
primaryId = myLocalId; primaryId = config.node;
strcpy(primaryConninfo, conninfo); strcpy(primaryConninfo, config.conninfo);
primaryConn = myLocalConn; primaryConn = myLocalConn;
} }
else else
{ {
/* I need the id of the primary as well as a connection to it */ /* I need the id of the primary as well as a connection to it */
primaryConn = getMasterConnection(myLocalConn, myLocalId, myClusterName, &primaryId); primaryConn = getMasterConnection(myLocalConn, config.node, config.cluster_name, &primaryId);
if (primaryConn == NULL) if (primaryConn == NULL)
exit(1); exit(1);
} }
checkClusterConfiguration(); checkClusterConfiguration();
checkNodeConfiguration(conninfo); checkNodeConfiguration(config.conninfo);
if (myLocalMode == STANDBY_MODE) if (myLocalMode == STANDBY_MODE)
{ {
MonitorCheck(); MonitorCheck();
@@ -239,7 +237,7 @@ MonitorExecute(void)
fprintf(stderr, "%s: another node has been promoted.\n", progname); fprintf(stderr, "%s: another node has been promoted.\n", progname);
for (connection_retries = 0; connection_retries < 6; connection_retries++) for (connection_retries = 0; connection_retries < 6; connection_retries++)
{ {
primaryConn = getMasterConnection(myLocalConn, myLocalId, myClusterName, &primaryId); primaryConn = getMasterConnection(myLocalConn, config.node, config.cluster_name, &primaryId);
if (PQstatus(primaryConn) == CONNECTION_OK) if (PQstatus(primaryConn) == CONNECTION_OK)
{ {
/* Connected, we can continue the process so break the loop */ /* Connected, we can continue the process so break the loop */
@@ -322,8 +320,8 @@ MonitorExecute(void)
"INSERT INTO repmgr_%s.repl_monitor " "INSERT INTO repmgr_%s.repl_monitor "
"VALUES(%d, %d, '%s'::timestamp with time zone, " "VALUES(%d, %d, '%s'::timestamp with time zone, "
" '%s', '%s', " " '%s', '%s', "
" %lld, %lld)", myClusterName, " %lld, %lld)", config.cluster_name,
primaryId, myLocalId, monitor_standby_timestamp, primaryId, config.node, monitor_standby_timestamp,
last_wal_primary_location, last_wal_primary_location,
last_wal_standby_received, last_wal_standby_received,
(lsn_primary - lsn_standby_received), (lsn_primary - lsn_standby_received),
@@ -346,7 +344,7 @@ checkClusterConfiguration(void)
sprintf(sqlquery, "SELECT oid FROM pg_class " sprintf(sqlquery, "SELECT oid FROM pg_class "
" WHERE oid = 'repmgr_%s.repl_nodes'::regclass", " WHERE oid = 'repmgr_%s.repl_nodes'::regclass",
myClusterName); config.cluster_name);
res = PQexec(myLocalConn, sqlquery); res = PQexec(myLocalConn, sqlquery);
if (PQresultStatus(res) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
{ {
@@ -384,7 +382,7 @@ checkNodeConfiguration(char *conninfo)
*/ */
sprintf(sqlquery, "SELECT * FROM repmgr_%s.repl_nodes " sprintf(sqlquery, "SELECT * FROM repmgr_%s.repl_nodes "
" WHERE id = %d AND cluster = '%s' ", " WHERE id = %d AND cluster = '%s' ",
myClusterName, myLocalId, myClusterName); config.cluster_name, config.node, config.cluster_name);
res = PQexec(myLocalConn, sqlquery); res = PQexec(myLocalConn, sqlquery);
if (PQresultStatus(res) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
@@ -406,7 +404,7 @@ checkNodeConfiguration(char *conninfo)
/* Adding the node */ /* Adding the node */
sprintf(sqlquery, "INSERT INTO repmgr_%s.repl_nodes " sprintf(sqlquery, "INSERT INTO repmgr_%s.repl_nodes "
"VALUES (%d, '%s', '%s')", "VALUES (%d, '%s', '%s')",
myClusterName, myLocalId, myClusterName, conninfo); config.cluster_name, config.node, config.cluster_name, conninfo);
if (!PQexec(primaryConn, sqlquery)) if (!PQexec(primaryConn, sqlquery))
{ {