Skip to content

IPMVAL-3701-daisychain-discovery-PR #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ericclappier-eaton wants to merge 1 commit into
base: master
Choose a base branch
from
+19 −13
Open

IPMVAL-3701-daisychain-discovery-PR #46

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions lib/src/fty_common_nut_utils_private.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,29 +48,35 @@ int runCommand(
int count = msTimeout / WAIT_TIMEOUT_LOOP;
if (count < 1) count = 1;
bool resulOk = false;
std::string tmp;
std::string tmpOutput, tmpError;
while (count > 0) {
auto res = proc.wait(WAIT_TIMEOUT_LOOP);
if (!res && res.error() == "timeout") {
count --;
tmp += proc.readAllStandardOutput();
logTrace("Wait process timeout, count={} tmp.size={}", count, tmp.size());
continue;
} else if (!res) {
logWarn("Cannot wait process, error: {}", res.error());
break;
if (!res) {
if (res.error() == "timeout") {
count --;
tmpOutput += proc.readAllStandardOutput();
tmpError += proc.readAllStandardError();
logTrace("Wait process timeout, count={} tmpOutput.size={} tmpError.size={}",
count, tmpOutput.size(), tmpError.size());
}
else {
logWarn("Cannot wait process, error: {}", res.error());
break;
}
} else {
tmp += proc.readAllStandardOutput();
logTrace("Wait process count={} *res={} tmp.size={}", count, *res, tmp.size());
tmpOutput += proc.readAllStandardOutput();
tmpError += proc.readAllStandardError();
logTrace("Wait process count={} *res={} tmpOutput.size={} tmpError.size={}",
count, *res, tmpOutput.size(), tmpError.size());
resulOk = (*res == 0);
break;
}
}

if (resulOk) {
stdout = tmp;
stdout = tmpOutput;
stderr = tmpError;
}
stderr = proc.readAllStandardError();

if (!stdout.empty()) {
logTrace("Standard output:\n{}", stdout);
Expand Down