Skip to content
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.

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

bs_dispatch: Fix log output #8755

Merged
merged 1 commit into from
Nov 22, 2019
Merged
Changes from all commits
Commits
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
7 changes: 4 additions & 3 deletions src/backend/bs_dispatch
Original file line number Diff line number Diff line change
Expand Up @@ -288,9 +288,10 @@ sub assignjob {
my $msg = "gave up after $attempt failed build attempts...";
push @args, "nobadhost=$msg" if checkbadhost(@attempts);
}
my $uri = "http://$worker->{'ip'}:$worker->{'port'}/build";
eval {
BSRPC::rpc({
'uri' => "http://$worker->{'ip'}:$worker->{'port'}/build",
'uri' => $uri,
'timeout' => 10 + int(length($infoxml) / 100000),
'request' => "PUT",
'headers' => [ "Content-Type: text/xml" ],
Expand All @@ -300,7 +301,7 @@ sub assignjob {
if ($@) {
my $err = $@;
chomp $err;
BSUtil::printlog("rpc error: $err");
BSUtil::printlog("rpc error: '$err' on accessing '$uri'");
unlink("$jobsdir/$arch/$job:status");
close F;
if ($err =~ /cannot build anything/) {
Expand Down Expand Up @@ -786,7 +787,7 @@ sub checkconstraints {
}
if (!$info->{'scheduleinfo'} || $info->{'scheduleinfo'} ne $details) {
$info->{'scheduleinfo'} = $details;
print "setting dispatch details to: $details\n";
BSUtil::printlog("setting dispatch details to: $details");
if ($sumworkers) {
setdispatchdetails($info, $arch, $job, $details);
} else {
Expand Down