db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-07-01 00:25:06 +02:00
Code Issues Releases Activity

Remove Perl info command invocation missed in 205525b6.

Browse Source
This commit is contained in:
David Steele
2019-08-19 21:57:14 -04:00
parent f6aef6e466
commit 6b5366a663
2 changed files with 51 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/pgBackRest/Main.pm
View File

@ -130,24 +130,12 @@ sub main
ERROR_PATH_MISSING); ERROR_PATH_MISSING);
} }
# Process info command
# ----------------------------------------------------------------------------------------------------------------------
if (cfgCommandTest(CFGCMD_INFO))
{
# Load module dynamically
require pgBackRest::Info;
pgBackRest::Info->import();
new pgBackRest::Info()->process();
}
else
{
logFileSet( logFileSet(
storageLocal(), storageLocal(),
cfgOption(CFGOPT_LOG_PATH) . '/' . cfgOption(CFGOPT_STANZA) . '-' . lc(cfgCommandName(cfgCommandGet()))); cfgOption(CFGOPT_LOG_PATH) . '/' . cfgOption(CFGOPT_STANZA) . '-' . lc(cfgCommandName(cfgCommandGet())));
# Process delete command # Process delete command
# -------------------------------------------------------------------------------------------------------------- # ----------------------------------------------------------------------------------------------------------------------
if (cfgCommandTest(CFGCMD_STANZA_DELETE)) if (cfgCommandTest(CFGCMD_STANZA_DELETE))
{ {
# Load module dynamically # Load module dynamically
@ -157,7 +145,7 @@ sub main
new pgBackRest::Stanza()->process(); new pgBackRest::Stanza()->process();
} }
# Process restore command # Process restore command
# ------------------------------------------------------------------------------------------------------------------ # ----------------------------------------------------------------------------------------------------------------------
elsif (cfgCommandTest(CFGCMD_RESTORE)) elsif (cfgCommandTest(CFGCMD_RESTORE))
{ {
# Check locality # Check locality
@ -187,7 +175,7 @@ sub main
} }
# Process stanza-create and stanza-upgrade commands # Process stanza-create and stanza-upgrade commands
# -------------------------------------------------------------------------------------------------------------- # ------------------------------------------------------------------------------------------------------------------
if (cfgCommandTest(CFGCMD_STANZA_CREATE) || cfgCommandTest(CFGCMD_STANZA_UPGRADE)) if (cfgCommandTest(CFGCMD_STANZA_CREATE) || cfgCommandTest(CFGCMD_STANZA_UPGRADE))
{ {
# Load module dynamically # Load module dynamically
@ -198,7 +186,7 @@ sub main
} }
# Process backup command # Process backup command
# -------------------------------------------------------------------------------------------------------------- # ------------------------------------------------------------------------------------------------------------------
elsif (cfgCommandTest(CFGCMD_BACKUP)) elsif (cfgCommandTest(CFGCMD_BACKUP))
{ {
# Load module dynamically # Load module dynamically
@ -216,7 +204,6 @@ sub main
} }
} }
} }
}
return 1; return 1;
} }

11
src/perl/embed.auto.c
View File

@ -8369,17 +8369,7 @@ static const EmbeddedModule embeddedModule[] =
"cfgOptionName(CFGOPT_REPO_PATH) . ' \\'' . cfgOption(CFGOPT_REPO_PATH) . '\\' does not exist',\n" "cfgOptionName(CFGOPT_REPO_PATH) . ' \\'' . cfgOption(CFGOPT_REPO_PATH) . '\\' does not exist',\n"
"ERROR_PATH_MISSING);\n" "ERROR_PATH_MISSING);\n"
"}\n" "}\n"
"\n\n\n"
"if (cfgCommandTest(CFGCMD_INFO))\n"
"{\n"
"\n" "\n"
"require pgBackRest::Info;\n"
"pgBackRest::Info->import();\n"
"\n"
"new pgBackRest::Info()->process();\n"
"}\n"
"else\n"
"{\n"
"logFileSet(\n" "logFileSet(\n"
"storageLocal(),\n" "storageLocal(),\n"
"cfgOption(CFGOPT_LOG_PATH) . '/' . cfgOption(CFGOPT_STANZA) . '-' . lc(cfgCommandName(cfgCommandGet())));\n" "cfgOption(CFGOPT_LOG_PATH) . '/' . cfgOption(CFGOPT_STANZA) . '-' . lc(cfgCommandName(cfgCommandGet())));\n"
@ -8442,7 +8432,6 @@ static const EmbeddedModule embeddedModule[] =
"}\n" "}\n"
"}\n" "}\n"
"}\n" "}\n"
"}\n"
"\n" "\n"
"return 1;\n" "return 1;\n"
"}\n" "}\n"