Update PREREQ_PM

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

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 73610b39f98896afdc912d706fa7203fcde68c67..b5d210de4e4454131f3c3403999268b2e7508a74 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -9,20 +9,17 @@ our $VERSION = '0.001';
 use Gruntmaster::Daemon::Constants qw/ERR/;
 use Gruntmaster::Daemon::Format qw/mkrun/;
 use Gruntmaster::Data;
-use Gruntmaster::Page::Log;
 
 use File::Basename qw/fileparse/;
 use File::Slurp qw/write_file/;
-use File::Spec::Functions qw/devnull/;
 use File::Temp qw/tempdir/;
-use IO::File;
-use IPC::Open3 qw/open3/;
 use Sys::Hostname qw/hostname/;
 use Time::HiRes qw/time/;
 use Try::Tiny;
-use YAML::Any qw/LoadFile DumpFile/;
 use Log::Log4perl qw/get_logger/;
 
+use constant PAGE_SIZE => 10;
+
 ##################################################
 
 sub safe_can_nodie {
@@ -75,7 +72,7 @@ sub process{
        $meta = job_inmeta $job;
        if (job_problem $job) {
          my $pbmeta = problem_meta job_problem $job;
-         my %files = %{$meta->{files}};
+         my %files = exists $meta->{files} ? %{$meta->{files}} : ();
          $meta = {%$meta, %$pbmeta};
          $meta->{files} = {%files, %{$pbmeta->{files}}} if exists $pbmeta->{files};
        }
@@ -129,20 +126,23 @@ sub process{
   set_job_results $job, \@full_results if scalar @full_results;
   set_job_errors $job, $errors;
 
-  my $log = $meta->{contest} ? "ct/$meta->{contest}/log" : 'log';
-  PUBLISH gensrc => $job;
+  my $log = $Gruntmaster::Data::contest ? "ct/$Gruntmaster::Data::contest/log" : 'log';
+
+  PUBLISH gensrc => ($Gruntmaster::Data::contest // '') . ".$job";
   PUBLISH genpage => "$log/job/$job.html";
   PUBLISH genpage => "$log/index.html";
   PUBLISH genpage => "$log/st.html";
-  my $page = ($job + Gruntmaster::Page::Log::PAGE_SIZE - 1) / Gruntmaster::Page::Log::PAGE_SIZE;
+  my $page = ($job + PAGE_SIZE - 1) / PAGE_SIZE;
   PUBLISH genpage => "$log/@{[$page - 1]}.html";
   PUBLISH genpage => "$log/$page.html";
   PUBLISH genpage => "$log/@{[$page + 1]}.html";
 }
 
 sub got_job{
-       my $job = shift;
-       get_logger->debug("Taking job $job...");
+       $_[0] =~ /^(\w*)\.(\d+)$/;
+       my $job = $2;
+       local $Gruntmaster::Data::contest = $1 if $1;
+       get_logger->debug("Taking job $job@{[defined $1 ? \" of contest $1\" : '']}...");
        if (set_job_daemon $job, hostname . ":$$") {
                get_logger->debug("Succesfully taken job $job");
                process $job;