ma27/hydra
0
0
Fork 0
forked from lix-project/hydra
Code Pull requests Activity

Separate payload elements using \t

Browse source
This commit is contained in:
Eelco Dolstra 2019-08-12 15:26:12 +02:00
parent c7861b85c4
commit 7114d2aceb
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/hydra-queue-runner/hydra-queue-runner.cc
View file

@ -299,9 +299,9 @@ void State::finishBuildStep(pqxx::work & txn, const RemoteResult & result,
(result.timesBuilt, result.timesBuilt > 0) (result.timesBuilt, result.timesBuilt > 0)
(result.isNonDeterministic, result.timesBuilt > 1) (result.isNonDeterministic, result.timesBuilt > 1)
.exec(); .exec();
assert(result.logFile.find('\'') == std::string::npos); assert(result.logFile.find('\t') == std::string::npos);
txn.exec(fmt("notify step_finished, '%d %d %s'", buildId, stepNr, txn.exec(fmt("notify step_finished, '%d\t%d\t%s'",
result.logFile.empty() ? "-" : result.logFile)); buildId, stepNr, result.logFile));
} }

2
src/script/hydra-notify
View file

@ -102,7 +102,7 @@ while (1) {
my ($channelName, $pid, $payload) = @$notify; my ($channelName, $pid, $payload) = @$notify;
#print STDERR "got '$channelName' from $pid: $payload\n"; #print STDERR "got '$channelName' from $pid: $payload\n";
my @payload = split / /, $payload; my @payload = split /\t/, $payload;
eval { eval {
if ($channelName eq "build_started") { if ($channelName eq "build_started") {