mirror of
https://github.com/EnterpriseDB/repmgr.git
synced 2026-03-22 22:56:29 +00:00
astyle fixes on logging change
This commit is contained in:
@@ -129,10 +129,10 @@ mkdir_p(char *path, mode_t omode)
|
||||
{
|
||||
struct stat sb;
|
||||
mode_t numask,
|
||||
oumask;
|
||||
oumask;
|
||||
int first,
|
||||
last,
|
||||
retval;
|
||||
last,
|
||||
retval;
|
||||
char *p;
|
||||
|
||||
p = path;
|
||||
|
||||
@@ -27,7 +27,7 @@ PGconn *establishDBConnectionByParams(const char *keywords[],
|
||||
bool is_standby(PGconn *conn);
|
||||
char *pg_version(PGconn *conn, char* major_version);
|
||||
bool guc_setted(PGconn *conn, const char *parameter, const char *op,
|
||||
const char *value);
|
||||
const char *value);
|
||||
const char *get_cluster_size(PGconn *conn);
|
||||
PGconn *getMasterConnection(PGconn *standby_conn, int id, char *cluster,
|
||||
int *master_id, char *master_conninfo_out);
|
||||
|
||||
16
repmgr.c
16
repmgr.c
@@ -50,7 +50,7 @@ static void help(const char *progname);
|
||||
static bool create_recovery_file(const char *data_dir, char *master_conninfo);
|
||||
static int test_ssh_connection(char *host, char *remote_user);
|
||||
static int copy_remote_files(char *host, char *remote_user, char *remote_path,
|
||||
char *local_path, bool is_directory);
|
||||
char *local_path, bool is_directory);
|
||||
static bool check_parameters_for_action(const int action);
|
||||
|
||||
static void do_master_register(void);
|
||||
@@ -290,7 +290,7 @@ main(int argc, char **argv)
|
||||
if (options.node == -1)
|
||||
{
|
||||
log_err(_("Node information is missing. "
|
||||
"Check the configuration file.\n"));
|
||||
"Check the configuration file.\n"));
|
||||
exit(ERR_BAD_CONFIG);
|
||||
}
|
||||
}
|
||||
@@ -1052,8 +1052,8 @@ stop_backup:
|
||||
last_wal_segment = PQgetvalue(res, 0, 0);
|
||||
|
||||
if (runtime_options.verbose)
|
||||
log_info(_("%s requires primary to keep WAL files %s until at least %s\n"),
|
||||
progname, first_wal_segment, last_wal_segment);
|
||||
log_info(_("%s requires primary to keep WAL files %s until at least %s\n"),
|
||||
progname, first_wal_segment, last_wal_segment);
|
||||
|
||||
/* Finished with the database connection now */
|
||||
PQclear(res);
|
||||
@@ -1638,9 +1638,9 @@ check_parameters_for_action(const int action)
|
||||
if (runtime_options.config_file[0])
|
||||
{
|
||||
log_notice(_("Only command line parameters for the connection "
|
||||
"to the master are used when issuing a STANDBY CLONE command. "
|
||||
"The passed configuration file is neither required nor used for "
|
||||
"its node configuration portions\n\n"));
|
||||
"to the master are used when issuing a STANDBY CLONE command. "
|
||||
"The passed configuration file is neither required nor used for "
|
||||
"its node configuration portions\n\n"));
|
||||
}
|
||||
/*
|
||||
* To clone a master into a standby we need connection parameters
|
||||
@@ -1650,7 +1650,7 @@ check_parameters_for_action(const int action)
|
||||
if (runtime_options.host == NULL)
|
||||
{
|
||||
log_notice(_("You need to use connection parameters to "
|
||||
"the master when issuing a STANDBY CLONE command."));
|
||||
"the master when issuing a STANDBY CLONE command."));
|
||||
ok = false;
|
||||
}
|
||||
need_a_node = false;
|
||||
|
||||
@@ -146,7 +146,7 @@ main(int argc, char **argv)
|
||||
if (local_options.node == -1)
|
||||
{
|
||||
log_err(_("Node information is missing. "
|
||||
"Check the configuration file, or provide one if you have not done so.\n"));
|
||||
"Check the configuration file, or provide one if you have not done so.\n"));
|
||||
exit(ERR_BAD_CONFIG);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user