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

Merge branch 'master' of git+ssh://git@git.2ndquadrant.it/git/repmgr

Browse Source
This commit is contained in:
Greg Smith
2011-03-03 09:27:18 -05:00
parent f372793114 58ec43106e
commit e7903a7971
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
repmgr.c
View File

@@ -256,7 +256,7 @@ main(int argc, char **argv)
parse_config(runtime_options.config_file, &options); parse_config(runtime_options.config_file, &options);
keywords[2] = "user"; keywords[2] = "user";
values[2] = runtime_options.username; values[2] = (runtime_options.username[0]) ? runtime_options.username : NULL;
keywords[3] = "dbname"; keywords[3] = "dbname";
values[3] = runtime_options.dbname; values[3] = runtime_options.dbname;
keywords[4] = "application_name"; keywords[4] = "application_name";
@@ -1379,7 +1379,8 @@ create_recovery_file(const char *data_dir, char *master_conninfo)
return false; return false;
} }
maxlen_snprintf(line, "primary_conninfo = 'host=%s port=%s'\n", runtime_options.host, runtime_options.masterport); maxlen_snprintf(line, "primary_conninfo = 'host=%s port=%s'\n", runtime_options.host,
(runtime_options.masterport[0]) ? runtime_options.masterport : "5432");
/* /*
* Template a password into the connection string in recovery.conf * Template a password into the connection string in recovery.conf
@@ -1399,7 +1400,8 @@ create_recovery_file(const char *data_dir, char *master_conninfo)
{ {
maxlen_snprintf(line, maxlen_snprintf(line,
"primary_conninfo = 'host=%s port=%s password=%s'\n", "primary_conninfo = 'host=%s port=%s password=%s'\n",
runtime_options.host, runtime_options.masterport, runtime_options.host,
(runtime_options.masterport[0]) ? runtime_options.masterport : "5432",
password); password);
} }
else else
@@ -1446,7 +1448,7 @@ copy_remote_files(char *host, char *remote_user, char *remote_path,
if (runtime_options.force) if (runtime_options.force)
strcat(rsync_flags, " --delete"); strcat(rsync_flags, " --delete");
if (remote_user == NULL) if (!remote_user[0])
{ {
maxlen_snprintf(host_string, "%s", host); maxlen_snprintf(host_string, "%s", host);
} }