forked from lix-project/hydra
* Use ->update({...}) properly.
This commit is contained in:
Eelco Dolstra
parent
717625a5b9
commit
8725dc03ec
|
|
@ -175,9 +175,7 @@ sub restart : Chained('build') PathPart Args(0) {
|
|||
($build->resultInfo->buildstatus == 3 ||
|
||||
$build->resultInfo->buildstatus == 4);
|
||||
|
||||
$build->finished(0);
|
||||
$build->timestamp(time());
|
||||
$build->update;
|
||||
$build->update({finished => 0, timestamp => time});
|
||||
|
||||
$build->resultInfo->delete;
|
||||
|
||||
|
|
|
|||
|
|
@ -153,11 +153,9 @@ sub updateProject {
|
|||
} else { # it's an existing jobset
|
||||
$jobset = ($project->jobsets->search({name => $baseName}))[0];
|
||||
die unless defined $jobset;
|
||||
$jobset->name($jobsetName);
|
||||
$jobset->description($description);
|
||||
$jobset->nixexprpath($nixExprPath);
|
||||
$jobset->nixexprinput($nixExprInput);
|
||||
$jobset->update;
|
||||
$jobset->update(
|
||||
{ name => $jobsetName, description => $description
|
||||
, nixexprpath => $nixExprPath, nixexprinput => $nixExprInput });
|
||||
}
|
||||
|
||||
my %inputNames;
|
||||
|
|
@ -189,9 +187,7 @@ sub updateProject {
|
|||
} else { # it's an existing jobset
|
||||
$input = ($jobset->jobsetinputs->search({name => $baseName2}))[0];
|
||||
die unless defined $input;
|
||||
$input->name($inputName);
|
||||
$input->type($inputType);
|
||||
$input->update;
|
||||
$input->update({name => $inputName, type => $inputType});
|
||||
}
|
||||
|
||||
# Update the values for this input. Just delete all the
|
||||
|
|
|
|||
|
|
@ -103,9 +103,9 @@ sub updateReleaseSet {
|
|||
my $releaseSetName = trim $c->request->params->{name};
|
||||
die "Invalid release set name: $releaseSetName" unless $releaseSetName =~ /^[[:alpha:]]\w*$/;
|
||||
|
||||
$releaseSet->name($releaseSetName);
|
||||
$releaseSet->description(trim $c->request->params->{description});
|
||||
$releaseSet->update;
|
||||
$releaseSet->update(
|
||||
{ name => $releaseSetName
|
||||
, description => trim $c->request->params->{description} });
|
||||
|
||||
$releaseSet->releasesetjobs->delete_all;
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ sub doBuild {
|
|||
if (!isValidPath($outPath)) {
|
||||
$isCachedBuild = 0;
|
||||
|
||||
# Do the build.
|
||||
$startTime = time();
|
||||
|
||||
my $thisBuildFailed = 0;
|
||||
|
|
@ -74,10 +75,7 @@ sub doBuild {
|
|||
(my $step) = $db->resultset('BuildSteps')->search(
|
||||
{id => $build->id, type => 0, drvpath => $drvPath}, {});
|
||||
die unless $step;
|
||||
$step->busy(0);
|
||||
$step->status(0);
|
||||
$step->stoptime(time);
|
||||
$step->update;
|
||||
$step->update({busy => 0, status => 0, time => 0});
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -89,12 +87,7 @@ sub doBuild {
|
|||
(my $step) = $db->resultset('BuildSteps')->search(
|
||||
{id => $build->id, type => 0, drvpath => $drvPathStep}, {});
|
||||
if ($step) {
|
||||
die unless $step;
|
||||
$step->busy(0);
|
||||
$step->status(1);
|
||||
$step->errormsg($4);
|
||||
$step->stoptime(time);
|
||||
$step->update;
|
||||
$step->update({busy => 0, status => 1, errormsg => $4, stoptime => time});
|
||||
} else {
|
||||
$db->resultset('BuildSteps')->create(
|
||||
{ id => $build->id
|
||||
|
|
@ -133,10 +126,7 @@ sub doBuild {
|
|||
(my $step) = $db->resultset('BuildSteps')->search(
|
||||
{id => $build->id, type => 1, outpath => $outPath}, {});
|
||||
die unless $step;
|
||||
$step->busy(0);
|
||||
$step->status(0);
|
||||
$step->stoptime(time);
|
||||
$step->update;
|
||||
$step->update({busy => 0, status => 0, stoptime => time});
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -146,11 +136,7 @@ sub doBuild {
|
|||
(my $step) = $db->resultset('BuildSteps')->search(
|
||||
{id => $build->id, type => 1, outpath => $outPath}, {});
|
||||
die unless $step;
|
||||
$step->busy(0);
|
||||
$step->status(1);
|
||||
$step->errormsg($3);
|
||||
$step->stoptime(time);
|
||||
$step->update;
|
||||
$step->update({busy => 0, status => 1, errormsg => $3, stoptime => time});
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -176,9 +162,7 @@ sub doBuild {
|
|||
}
|
||||
|
||||
$db->txn_do(sub {
|
||||
$build->finished(1);
|
||||
$build->timestamp(time());
|
||||
$build->update;
|
||||
$build->({finished => 1, timestamp => time});
|
||||
|
||||
my $logPath = "/nix/var/log/nix/drvs/" . basename $drvPath;
|
||||
$logPath = undef unless -e $logPath;
|
||||
|
|
@ -283,9 +267,7 @@ $db->txn_do(sub {
|
|||
if ($build->schedulingInfo->busy != 0 && $build->schedulingInfo->locker != getppid) {
|
||||
die "build $buildId is already being built";
|
||||
}
|
||||
$build->schedulingInfo->busy(1);
|
||||
$build->schedulingInfo->locker($$);
|
||||
$build->schedulingInfo->update;
|
||||
$build->schedulingInfo->update({busy => 1, locker => $$});
|
||||
$build->buildsteps->delete_all;
|
||||
$build->buildproducts->delete_all;
|
||||
});
|
||||
|
|
@ -301,8 +283,6 @@ eval {
|
|||
if ($@) {
|
||||
warn $@;
|
||||
$db->txn_do(sub {
|
||||
$build->schedulingInfo->busy(0);
|
||||
$build->schedulingInfo->locker($$);
|
||||
$build->schedulingInfo->update;
|
||||
$build->schedulingInfo->update({busy => 0, locker => $$});
|
||||
});
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,8 +84,7 @@ sub fetchInputAlt {
|
|||
} else {
|
||||
$timestamp = $cachedInput->timestamp;
|
||||
$db->txn_do(sub {
|
||||
$cachedInput->lastseen(time);
|
||||
$cachedInput->update;
|
||||
$cachedInput->update({lastseen => time});
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -274,9 +273,7 @@ sub setJobsetError {
|
|||
my ($jobset, $errorMsg) = @_;
|
||||
eval {
|
||||
$db->txn_do(sub {
|
||||
$jobset->errormsg($errorMsg);
|
||||
$jobset->errortime(time);
|
||||
$jobset->update;
|
||||
$jobset->update({errormsg => $errorMsg, errortime => time});
|
||||
});
|
||||
};
|
||||
}
|
||||
|
|
@ -316,8 +313,7 @@ sub checkJobSet {
|
|||
my $inputInfo = {};
|
||||
|
||||
$db->txn_do(sub {
|
||||
$jobset->lastcheckedtime(time);
|
||||
$jobset->update;
|
||||
$jobset->update({lastcheckedtime => time});
|
||||
});
|
||||
|
||||
# Fetch all values for all inputs.
|
||||
|
|
|
|||
Loading…
Reference in a new issue