Bump version and update Changes

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon.pm

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index cc4a1290c27caa25fe618f04281ff3c4a292bded..84b57adf977e92b078e7b34e159166046b0946c7 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -4,7 +4,7 @@ use 5.014000;
 use strict;
 use warnings;
 
-our $VERSION = '5999.000_004';
+our $VERSION = '5999.000_005';
 
 use Gruntmaster::Daemon::Constants qw/ERR/;
 use Gruntmaster::Daemon::Format qw/prepare_files stopvms/;
@@ -105,7 +105,7 @@ sub process{
 
 sub process_job {
        my ($job) = @_;
-       my $pb = problem_full($job->{problem});
+       my $pb = db()->select('problems', '*', {id => $job->{problem}})->hash;
        my $meta = {
                problem => $job->{problem},
                files => {
@@ -121,7 +121,7 @@ sub process_job {
        $meta->{timeout} = $timeout_override if defined $timeout_override;
        $meta->{tests} = decode_json $pb->{tests} if $meta->{runner} eq 'File';
        $job->{contest} &&= contest_entry($job->{contest});
-       delete $meta->{precnt} unless $job->{contest} && $job->{contest}{started} && !$job->{contest}{finished};
+       delete $meta->{precnt} unless $job->{contest} && $job->{contest}{started} && !$job->{contest}{finished}; ## no critic (ProhibitNegativeExpressionsInUnlessAndUntilConditions)
        $meta->{testcnt} = $meta->{precnt} if $meta->{precnt};
 
        $meta->{files}{ver} = {
@@ -153,7 +153,7 @@ my $daemon = hostname . ":$$";
 sub run{
        require Gruntmaster::Data;
        Gruntmaster::Data->import;
-       Gruntmaster::Data::init($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
+       dbinit($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
        Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf');
        get_logger->info("gruntmasterd $VERSION started ($daemon)");
        my $dir = tempdir 'gruntmasterd.XXXX', CLEANUP => 1, TMPDIR => 1;