X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=7166a4238a5d4809ed0b2cf49d1584af48242fae;hp=82da6b8924791d53388d43191b4b8d26023bc6b4;hb=6d590c603e3b14f1dc198e3635a85543565d1016;hpb=82657f577602c92f72c1030465ada83053e95e8d

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 82da6b8..7166a42 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -58,9 +58,19 @@ sub process{
   try {
 	$meta = job_inmeta $job;
 	if (job_problem $job) {
-	  my $pbmeta = problem_meta job_problem $job;
+	  local $_ = job_problem $job;
+	  my $pbmeta = problem_meta;
 	  my %files = exists $meta->{files} ? %{$meta->{files}} : ();
-	  $meta = {%$meta, %$pbmeta};
+	  $meta = {
+		  %$meta,
+		  (defined problem_generator() ? (generator => problem_generator) : ()),
+		  (defined problem_runner()    ? (runner    => problem_runner)    : ()),
+		  (defined problem_judge()     ? (judge     => problem_judge)     : ()),
+		  (defined problem_testcnt()   ? (testcnt   => problem_testcnt)   : ()),
+		  (defined problem_timeout()   ? (timeout   => problem_timeout)   : ()),
+		  (defined problem_olimit()    ? (olimit    => problem_olimit)    : ()),
+		  %$pbmeta
+	  };
 	  $meta->{files} = {%files, %{$pbmeta->{files}}} if exists $pbmeta->{files};
 	}