Fix contest job log updating

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

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 73610b39f98896afdc912d706fa7203fcde68c67..d6369656337bdf37152c0b1d950317fdce3496fc 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -129,7 +129,7 @@ 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';
+  my $log = $Gruntmaster::Data::contest ? "ct/$Gruntmaster::Data::contest/log" : 'log';
   PUBLISH gensrc => $job;
   PUBLISH genpage => "$log/job/$job.html";
   PUBLISH genpage => "$log/index.html";
@@ -141,8 +141,10 @@ sub process{
 }
 
 sub got_job{
-       my $job = shift;
-       get_logger->debug("Taking job $job...");
+       $_[0] =~ /^(\w*)\.(\d+)$/;
+       my $job = $2;
+       $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;