Francois Gouget : testbot/Janitor: Use filters to get old Jobs, Patches and RecordGroups.
Alexandre Julliard
julliard at winehq.org
Thu Jan 25 17:26:09 CST 2018
Module: tools
Branch: master
Commit: de408a9199fbfd97dffcbae7ada3c1e97c60e044
URL: https://source.winehq.org/git/tools.git/?a=commit;h=de408a9199fbfd97dffcbae7ada3c1e97c60e044
Author: Francois Gouget <fgouget at codeweavers.com>
Date: Thu Jan 25 03:44:03 2018 +0100
testbot/Janitor: Use filters to get old Jobs, Patches and RecordGroups.
Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
testbot/bin/Janitor.pl | 47 +++++++++++++++++++----------------------------
1 file changed, 19 insertions(+), 28 deletions(-)
diff --git a/testbot/bin/Janitor.pl b/testbot/bin/Janitor.pl
index 0f126e8..382408d 100755
--- a/testbot/bin/Janitor.pl
+++ b/testbot/bin/Janitor.pl
@@ -57,19 +57,16 @@ delete $ENV{ENV};
# Delete obsolete Jobs
if ($JobPurgeDays != 0)
{
- my $DeleteBefore = time() - $JobPurgeDays * 86400;
my $Jobs = CreateJobs();
+ $Jobs->AddFilter("Submitted", [time() - $JobPurgeDays * 86400], "<");
foreach my $Job (@{$Jobs->GetItems()})
{
- if ($Job->Submitted < $DeleteBefore)
+ LogMsg "Deleting job ", $Job->Id, "\n";
+ $Job->RmTree();
+ my $ErrMessage = $Jobs->DeleteItem($Job);
+ if (defined($ErrMessage))
{
- LogMsg "Deleting job ", $Job->Id, "\n";
- $Job->RmTree();
- my $ErrMessage = $Jobs->DeleteItem($Job);
- if (defined($ErrMessage))
- {
- LogMsg $ErrMessage, "\n";
- }
+ LogMsg $ErrMessage, "\n";
}
}
}
@@ -102,23 +99,20 @@ foreach my $Set (@{$Sets->GetItems()})
# Delete obsolete Patches now that no Job references them
if ($JobPurgeDays != 0)
{
- $DeleteBefore = time() - $JobPurgeDays * 86400;
my $Patches = CreatePatches();
+ $Patches->AddFilter("Received", [time() - $JobPurgeDays * 86400], "<");
foreach my $Patch (@{$Patches->GetItems()})
{
- if ($Patch->Received < $DeleteBefore)
+ my $Jobs = CreateJobs();
+ $Jobs->AddFilter("Patch", [$Patch]);
+ if ($Jobs->IsEmpty())
{
- my $Jobs = CreateJobs();
- $Jobs->AddFilter("Patch", [$Patch]);
- if ($Jobs->IsEmpty())
+ LogMsg "Deleting patch ", $Patch->Id, "\n";
+ unlink("$DataDir/patches/" . $Patch->Id);
+ my $ErrMessage = $Patches->DeleteItem($Patch);
+ if (defined($ErrMessage))
{
- LogMsg "Deleting patch ", $Patch->Id, "\n";
- unlink("$DataDir/patches/" . $Patch->Id);
- my $ErrMessage = $Patches->DeleteItem($Patch);
- if (defined($ErrMessage))
- {
- LogMsg $ErrMessage, "\n";
- }
+ LogMsg $ErrMessage, "\n";
}
}
}
@@ -270,17 +264,14 @@ else
# Delete obsolete record groups
if ($JobPurgeDays != 0)
{
- $DeleteBefore = time() - $JobPurgeDays * 86400;
my $RecordGroups = CreateRecordGroups();
+ $RecordGroups->AddFilter("Timestamp", [time() - $JobPurgeDays * 86400], "<");
foreach my $RecordGroup (@{$RecordGroups->GetItems()})
{
- if ($RecordGroup->Timestamp < $DeleteBefore)
+ my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup);
+ if (defined($ErrMessage))
{
- my $ErrMessage = $RecordGroups->DeleteItem($RecordGroup);
- if (defined($ErrMessage))
- {
- LogMsg $ErrMessage, "\n";
- }
+ LogMsg $ErrMessage, "\n";
}
}
}
More information about the wine-cvs
mailing list