X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=3b3f5be619fb032520f9a73fb7dd4479f5108829;hp=6991b7a00a2481fa67971c225bacaf308dda20e1;hb=cfb728e8fd9f99459af9851fb9901f3e9b82957e;hpb=95ea982c47736f78aa3d4c95b64907a917494ec0

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 6991b7a..3b3f5be 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -8,7 +8,7 @@ our $VERSION = '0.001';
 
 use Gruntmaster::Daemon::Constants qw/ERR/;
 use Gruntmaster::Daemon::Format qw/mkrun/;
-use Gruntmaster::Data qw/job_inmeta job_problem problem_meta set_job_daemon set_job_result set_job_result_text set_job_results SUBSCRIBE WAIT_FOR_MESSAGES/;
+use Gruntmaster::Data;
 use Gruntmaster::Page::Log;
 
 use File::Basename qw/fileparse/;
@@ -43,15 +43,12 @@ sub safe_can {
 
 sub prepare{
   my ($name, $format) = @_;
+  our $errors;
   my $basename = fileparse $name, qr/\.[^.]*/;
   get_logger->trace("Preparing file $name...");
 
-  open my $devnull, devnull;
-  open my $errors, '>>compile-error';
-  my $ret = open3 $devnull, $errors, undef, 'gruntmaster-compile', $format => $basename, $name;
-  waitpid $ret, 0;
-  close $devnull;
-  close $errors;
+  $errors .= `gruntmaster-compile $format $basename $name 2>&1`;
+  $errors .= "\n";
   die 'Compile error' if $?
 }
 
@@ -73,6 +70,7 @@ sub process{
   my @results;
   my @full_results = ();
   my $meta = {};
+  our $errors = '';
   try {
 	$meta = job_inmeta $job;
 	if (job_problem $job) {
@@ -83,6 +81,7 @@ sub process{
 	}
 
 	prepare_files $meta;
+	chomp $errors;
 
 	my ($files, $generator, $runner, $judge, $testcnt) = map { $meta->{$_} or die "Required parameter missing: $_"} qw/files generator runner judge testcnt/;
 
@@ -128,17 +127,24 @@ sub process{
   set_job_result $job, $meta->{result};
   set_job_result_text $job, $meta->{result_text};
   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;
   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;
-  PUBLISH genpage => "$log/$page.html"
+  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;
+	$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;
@@ -149,7 +155,7 @@ sub got_job{
 }
 
 sub run{
-  Log::Log4perl->init('/etc/gruntmasterd-log.conf');
+  Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf');
   get_logger->info("gruntmasterd $VERSION started");
   chdir tempdir 'gruntmasterd.XXXX', CLEANUP => 1, TMPDIR => 1;
   SUBSCRIBE jobs => \&got_job;