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

Formatting using astyle

Browse Source
This commit is contained in:
Jaime Casanova
2012-12-11 11:54:35 -05:00
parent d5ec394c54
commit d7d91e1c12
3 changed files with 41 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
check_dir.c
View File

@@ -129,10 +129,10 @@ mkdir_p(char *path, mode_t omode)
{ {
struct stat sb; struct stat sb;
mode_t numask, mode_t numask,
oumask; oumask;
int first, int first,
last, last,
retval; retval;
char *p; char *p;
p = path; p = path;

62
repmgr.c
View File

@@ -368,7 +368,7 @@ do_cluster_show(void)
conn = establishDBConnection(options.conninfo, true); conn = establishDBConnection(options.conninfo, true);
sqlquery_snprintf(sqlquery, "SELECT conninfo FROM %s.repl_nodes;", repmgr_schema); sqlquery_snprintf(sqlquery, "SELECT conninfo FROM %s.repl_nodes;", repmgr_schema);
log_debug("cluster show: %s\n", sqlquery); log_debug("cluster show: %s\n", sqlquery);
res = PQexec(conn, sqlquery); res = PQexec(conn, sqlquery);
if (PQresultStatus(res) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
@@ -430,15 +430,15 @@ do_cluster_cleanup(void)
if (runtime_options.keep_history > 0) if (runtime_options.keep_history > 0)
{ {
sqlquery_snprintf(sqlquery, "DELETE FROM %s.repl_monitor " sqlquery_snprintf(sqlquery, "DELETE FROM %s.repl_monitor "
" WHERE age(now(), last_monitor_time) >= '%d days'::interval;", " WHERE age(now(), last_monitor_time) >= '%d days'::interval;",
repmgr_schema, runtime_options.keep_history); repmgr_schema, runtime_options.keep_history);
} }
else else
{ {
sqlquery_snprintf(sqlquery, "TRUNCATE TABLE %s.repl_monitor;", repmgr_schema); sqlquery_snprintf(sqlquery, "TRUNCATE TABLE %s.repl_monitor;", repmgr_schema);
} }
log_debug("cluster cleanup: %s\n", sqlquery); log_debug("cluster cleanup: %s\n", sqlquery);
res = PQexec(master_conn, sqlquery); res = PQexec(master_conn, sqlquery);
if (PQresultStatus(res) != PGRES_COMMAND_OK) if (PQresultStatus(res) != PGRES_COMMAND_OK)
{ {
@@ -451,7 +451,7 @@ do_cluster_cleanup(void)
/* Let's VACUUM the table to avoid autovacuum to be launched in an unexpected hour */ /* Let's VACUUM the table to avoid autovacuum to be launched in an unexpected hour */
sqlquery_snprintf(sqlquery, "VACUUM %s.repl_monitor;", repmgr_schema); sqlquery_snprintf(sqlquery, "VACUUM %s.repl_monitor;", repmgr_schema);
log_debug("cluster cleanup: %s\n", sqlquery); log_debug("cluster cleanup: %s\n", sqlquery);
res = PQexec(master_conn, sqlquery); res = PQexec(master_conn, sqlquery);
/* XXX There is any need to check this VACUUM happens without problems? */ /* XXX There is any need to check this VACUUM happens without problems? */
@@ -1604,7 +1604,7 @@ test_ssh_connection(char *host, char *remote_user)
char script[MAXLEN]; char script[MAXLEN];
int r; int r;
/* On some OS, true is located in a different place than in Linux */ /* On some OS, true is located in a different place than in Linux */
#ifdef __FreeBSD__ #ifdef __FreeBSD__
#define TRUEBIN_PATH "/usr/bin/true" #define TRUEBIN_PATH "/usr/bin/true"
#else #else
@@ -1833,32 +1833,36 @@ check_parameters_for_action(const int action)
static void static void
write_primary_conninfo(char* line) write_primary_conninfo(char* line)
{ {
char host_buf[MAXLEN] = ""; char host_buf[MAXLEN] = "";
char conn_buf[MAXLEN] = ""; char conn_buf[MAXLEN] = "";
char user_buf[MAXLEN] = ""; char user_buf[MAXLEN] = "";
char password_buf[MAXLEN] = ""; char password_buf[MAXLEN] = "";
/* Environment variable for password (UGLY, please use .pgpass!) */ /* Environment variable for password (UGLY, please use .pgpass!) */
const char *password = getenv("PGPASSWORD"); const char *password = getenv("PGPASSWORD");
if (password != NULL) { if (password != NULL)
maxlen_snprintf(password_buf, " password=%s", password); {
} maxlen_snprintf(password_buf, " password=%s", password);
else if (require_password) { }
log_err(_("%s: PGPASSWORD not set, but having one is required\n"), else if (require_password)
progname); {
exit(ERR_BAD_PASSWORD); log_err(_("%s: PGPASSWORD not set, but having one is required\n"),
} progname);
exit(ERR_BAD_PASSWORD);
}
if (runtime_options.host[0]) { if (runtime_options.host[0])
maxlen_snprintf(host_buf, " host=%s", runtime_options.host); {
} maxlen_snprintf(host_buf, " host=%s", runtime_options.host);
}
if (runtime_options.username[0]) { if (runtime_options.username[0])
maxlen_snprintf(user_buf, " user=%s", runtime_options.username); {
} maxlen_snprintf(user_buf, " user=%s", runtime_options.username);
}
maxlen_snprintf(conn_buf, "port=%s%s%s%s", maxlen_snprintf(conn_buf, "port=%s%s%s%s",
(runtime_options.masterport[0]) ? runtime_options.masterport : "5432", host_buf, user_buf, password_buf); (runtime_options.masterport[0]) ? runtime_options.masterport : "5432", host_buf, user_buf, password_buf);
maxlen_snprintf(line, "primary_conninfo = '%s'", conn_buf); maxlen_snprintf(line, "primary_conninfo = '%s'", conn_buf);
} }