Add contest support to gensrc

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

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 3b3f5be619fb032520f9a73fb7dd4479f5108829..c3ee5914c5cd5244bfe28ac5d38aefbd7bf0c596 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -129,8 +129,8 @@ 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";
@@ -143,7 +143,7 @@ sub process{
 sub got_job{
        $_[0] =~ /^(\w*)\.(\d+)$/;
        my $job = $2;
-       $Gruntmaster::Data::contest = $1 if $1;
+       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");