X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=a726219ed1bc2e62070be89c6908bfefc043e4f8;hb=58e551a48f84e4816311b8a92256a130b812be50;hp=cc4a1290c27caa25fe618f04281ff3c4a292bded;hpb=6101c7ad498081e435b1fa006c58b44b3c2400f1;p=gruntmaster-daemon.git

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index cc4a129..a726219 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -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;