ahuston-0/hydra
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Open the DB using Hydra::Model::DB->new

Browse Source 
This gets rid of the openHydraDB function and ensures that we
open the database in a consistent way.

Also drop the PostgreSQL sequence hacks.  They don't seem to be
necessary anymore.
This commit is contained in:
Eelco Dolstra
2012-03-13 12:10:19 +01:00
parent 914c5e248a
commit 179b012a8e
12 changed files with 31 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/script/hydra-build
View File

@ -6,6 +6,7 @@ use File::stat;
use Nix::Store;
use Hydra::Schema;
use Hydra::Helper::Nix;
use Hydra::Model::DB;
use Hydra::Helper::AddBuilds;
use Email::Sender::Simple qw(sendmail);
use Email::Sender::Transport::SMTP;
@ -21,7 +22,7 @@ use feature qw/switch/;
STDOUT->autoflush();
my $db = openHydraDB;
my $db = Hydra::Model::DB->new();
my %config = new Config::General(getHydraConf)->getall;

4
src/script/hydra-evaluator
View File

@ -5,8 +5,8 @@ use feature 'switch';
use Hydra::Schema;
use Hydra::Helper::Nix;
use Hydra::Helper::AddBuilds;
use Hydra::Model::DB;
use Digest::SHA qw(sha256_hex);
use Email::Sender::Simple qw(sendmail);
use Email::Sender::Transport::SMTP;
use Email::Simple;
@ -17,7 +17,7 @@ use Data::Dump qw(dump);
STDOUT->autoflush();
my $db = openHydraDB;
my $db = Hydra::Model::DB->new();
my %config = new Config::General(getHydraConf)->getall;

3
src/script/hydra-init
View File

@ -3,11 +3,12 @@
use strict;
use Hydra::Schema;
use Hydra::Helper::Nix;
use Hydra::Model::DB;
use File::Slurp;
use SQL::SplitStatement;
use List::Util qw(max);
my $db = openHydraDB;
my $db = Hydra::Model::DB->new();
my $dbh = $db->storage->dbh;
$dbh->{RaiseError} = 1;

5
src/script/hydra-queue-runner
View File

@ -6,11 +6,12 @@ use File::Basename;
use POSIX qw(dup2 :sys_wait_h);
use Hydra::Schema;
use Hydra::Helper::Nix;
use Hydra::Model::DB;
use IO::Handle;
use Nix::Store;
chdir getHydraPath or die;
my $db = openHydraDB;
chdir Hydra::Model::DB::getHydraPath or die;
my $db = Hydra::Model::DB->new();
STDOUT->autoflush();

5
src/script/hydra-update-gc-roots
View File

@ -6,9 +6,10 @@ use File::Basename;
use Nix::Store;
use Hydra::Schema;
use Hydra::Helper::Nix;
use Hydra::Model::DB;
use POSIX qw(strftime);
my $db = openHydraDB;
my $db = Hydra::Model::DB->new();
my %roots;
@ -75,7 +76,7 @@ foreach my $project ($db->resultset('Projects')->search({}, { order_by => ["name
# If the jobset has been disabled for more than one week, than
# don't keep its builds anymore.
if ($jobset->enabled == 0 && (time() - $jobset->lastcheckedtime > (7 * 24 * 3600))) {
if ($jobset->enabled == 0 && (time() - ($jobset->lastcheckedtime || 0) > (7 * 24 * 3600))) {
print STDERR "*** skipping disabled jobset ", $project->name, ":", $jobset->name, "\n";
next;
}