Skip to content

DPL: clean up leftovers from input stream after parsing a workflow #15087

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
ehellbar wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

DPL: clean up leftovers from input stream after parsing a workflow #15087

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
15 changes: 14 additions & 1 deletion Framework/Core/src/WorkflowSerializationHelpers.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
#include <memory>

O2_DECLARE_DYNAMIC_LOG(workflow_importer);
O2_DECLARE_DYNAMIC_LOG(post_workflow_importer);

namespace o2::framework
{
Expand Down Expand Up @@ -969,7 +970,19 @@ bool WorkflowSerializationHelpers::import(std::istream& s,
WorkflowImporter importer{workflow, metadata, command};
bool ok = reader.Parse(isw, importer);
if (ok == false) {
throw std::runtime_error("Error while parsing serialised workflow");
if (s.eof()) {
throw std::runtime_error("Error while parsing serialised workflow");
} else {
// clean up leftovers at the end of the input stream, e.g. [DEBUG] message from destructors
while (true) {
O2_SIGNPOST_ID_GENERATE(sid, post_workflow_importer);
s.getline(buf, 1024, '\n');
if (s.eof()) {
break;
}
O2_SIGNPOST_EVENT_EMIT(post_workflow_importer, sid, "post import", "Following leftover line found in input stream after parsing workflow: %{public}s", buf);
}
}
}
return true;
}
Expand Down