Only collect remote command output if the caller requires it

This addresses GitHub #216 and #167.
This commit is contained in:
Gianni Ciolli
2016-08-04 20:59:47 +02:00
committed by Ian Barwick
parent 00e55c0672
commit 85f68e9f77

View File

@@ -3526,7 +3526,7 @@ do_standby_switchover(void)
remote_host,
runtime_options.remote_user,
command,
&command_output);
NULL);
termPQExpBuffer(&command_output);
@@ -5956,15 +5956,18 @@ remote_command(const char *host, const char *user, const char *command, PQExpBuf
return false;
}
/* TODO: better error handling */
while (fgets(output, MAXLEN, fp) != NULL)
if (outputbuf != NULL)
{
appendPQExpBuffer(outputbuf, "%s", output);
/* TODO: better error handling */
while (fgets(output, MAXLEN, fp) != NULL)
{
appendPQExpBuffer(outputbuf, "%s", output);
}
}
pclose(fp);
log_verbose(LOG_DEBUG, "remote_command(): output returned was:\n%s", outputbuf->data);
if (outputbuf != NULL)
log_verbose(LOG_DEBUG, "remote_command(): output returned was:\n%s", outputbuf->data);
return true;
}