db/pg_probackup
db/pg_probackup
1
0
Fork 0
mirror of https://github.com/postgrespro/pg_probackup.git synced 2025-01-07 13:40:17 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'origin/pgpro_2605'

Browse Source
This commit is contained in:
Grigory Smolkin 2019-04-08 13:47:46 +03:00
commit 2941cb1cd3
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pg_probackup.c
View File

@ -22,6 +22,7 @@
const char *PROGRAM_VERSION = "2.0.27"; const char *PROGRAM_VERSION = "2.0.27";
const char *PROGRAM_URL = "https://github.com/postgrespro/pg_probackup"; const char *PROGRAM_URL = "https://github.com/postgrespro/pg_probackup";
const char *PROGRAM_EMAIL = "https://github.com/postgrespro/pg_probackup/issues"; const char *PROGRAM_EMAIL = "https://github.com/postgrespro/pg_probackup/issues";
const char *PROGRAM_FULL_PATH = NULL;
typedef enum ProbackupSubcmd typedef enum ProbackupSubcmd
{ {
@ -201,6 +202,14 @@ main(int argc, char *argv[])
init_config(&instance_config); init_config(&instance_config);
PROGRAM_NAME = get_progname(argv[0]); PROGRAM_NAME = get_progname(argv[0]);
PROGRAM_FULL_PATH = palloc0(MAXPGPATH);
if (find_my_exec(argv[0],(char *) PROGRAM_FULL_PATH) < 0)
{
fprintf(stderr, _("%s: could not find own program executable\n"), PROGRAM_NAME);
exit(1);
}
set_pglocale_pgservice(argv[0], "pgscripts"); set_pglocale_pgservice(argv[0], "pgscripts");
#if PG_VERSION_NUM >= 110000 #if PG_VERSION_NUM >= 110000

2
src/restore.c
View File

@ -796,7 +796,7 @@ create_recovery_conf(time_t backup_id,
fprintf(fp, "restore_command = '%s archive-get -B %s --instance %s " fprintf(fp, "restore_command = '%s archive-get -B %s --instance %s "
"--wal-file-path %%p --wal-file-name %%f'\n", "--wal-file-path %%p --wal-file-name %%f'\n",
PROGRAM_NAME, backup_path, instance_name); PROGRAM_FULL_PATH, backup_path, instance_name);
/* /*
* We've already checked that only one of the four following mutually * We've already checked that only one of the four following mutually

1
src/utils/pgut.h
View File

@ -20,6 +20,7 @@ typedef void (*pgut_atexit_callback)(bool fatal, void *userdata);
* pgut client variables and functions * pgut client variables and functions
*/ */
extern const char *PROGRAM_NAME; extern const char *PROGRAM_NAME;
extern const char *PROGRAM_FULL_PATH;
extern const char *PROGRAM_VERSION; extern const char *PROGRAM_VERSION;
extern const char *PROGRAM_URL; extern const char *PROGRAM_URL;
extern const char *PROGRAM_EMAIL; extern const char *PROGRAM_EMAIL;