Remove useless constant PAGE_SIZE

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

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 3a836924afebea26ff627c55c4fa342365332fcd..51e0681bcb8933a780f41c9034ef6f6342a13aa5 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -17,7 +17,6 @@ use Time::HiRes qw/time/;
 use Try::Tiny;
 use Log::Log4perl qw/get_logger/;
 
-use constant PAGE_SIZE => 10;
 use constant FORMAT_EXTENSION => {
        C => 'c',
        CPP => 'cpp',
@@ -111,9 +110,11 @@ sub process_job {
                                content => $job->source,
                        },
                },
-               map { $_ => $job->problem->get_column($_) } qw/generator runner judge testcnt timeout olimit/
+               map { $_ => $job->problem->get_column($_) } qw/generator runner judge precnt testcnt timeout olimit/
        };
        $meta->{tests} = decode_json $job->problem->tests if $meta->{runner} eq 'File';
+       delete $meta->{precnt} if $job->problem->is_in_archive;
+       $meta->{testcnt} = $meta->{precnt} if $meta->{precnt};
 
        $meta->{files}{ver} = {
                name => 'ver.' . FORMAT_EXTENSION->{$job->problem->verformat},
@@ -123,6 +124,7 @@ sub process_job {
 
        process $meta;
 
+       $meta->{result_text} .= ' (pretests)' if $meta->{precnt};
        $job->update({
                result => $meta->{result},
                result_text => $meta->{result_text},
@@ -144,14 +146,13 @@ sub got_job{
        my $id = $job->id;
        get_logger->debug("Taking job $id...");
        my $daemon = hostname . ":$$";
-       $job->update({daemon => $daemon});
-       #if (set_job_daemon $job, hostname . ":$$") {
-       if (1) {
+       $job->update({daemon => $daemon}, {where => {daemon => undef}})->discard_changes;
+       if ($job->daemon eq $daemon) {
                get_logger->debug("Succesfully taken job $id");
                process_job $job;
                get_logger->debug("Job $id done");
        } else {
-               get_logger->debug("Job $id already taken");
+               get_logger->debug("Job $id already taken by " . $job->daemon);
        }
 }