X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=c3ee5914c5cd5244bfe28ac5d38aefbd7bf0c596;hb=738dd65fba20a13ba486e71366febc16f1087b21;hp=73610b39f98896afdc912d706fa7203fcde68c67;hpb=22e9a940bf1efad4f2f27da94eba52b8aa96b54f;p=gruntmaster-daemon.git

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 73610b3..c3ee591 100644
--- 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";
@@ -141,8 +141,10 @@ sub process{
 }
 
 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;