X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=b5d210de4e4454131f3c3403999268b2e7508a74;hp=98cde4d7c8e17e27d329cafcb5dbb7d615b4878b;hb=ad4bd022cfaea149b8af3219234617f420d556cf;hpb=5eb76f359e78b751969098f7626ffa41b6ea7f5e

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 98cde4d..b5d210d 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -8,21 +8,18 @@ our $VERSION = '0.001';
 
 use Gruntmaster::Daemon::Constants qw/ERR/;
 use Gruntmaster::Daemon::Format qw/mkrun/;
-use Gruntmaster::Page qw/generate/;
-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 File::Basename qw/fileparse/;
 use File::Slurp qw/write_file/;
-use File::Spec::Functions qw/devnull/;
 use File::Temp qw/tempdir/;
-use IO::File;
-use IPC::Open3 qw/open3/;
 use Sys::Hostname qw/hostname/;
 use Time::HiRes qw/time/;
 use Try::Tiny;
-use YAML::Any qw/LoadFile DumpFile/;
 use Log::Log4perl qw/get_logger/;
 
+use constant PAGE_SIZE => 10;
+
 ##################################################
 
 sub safe_can_nodie {
@@ -43,15 +40,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,16 +67,18 @@ sub process{
   my @results;
   my @full_results = ();
   my $meta = {};
+  our $errors = '';
   try {
 	$meta = job_inmeta $job;
 	if (job_problem $job) {
 	  my $pbmeta = problem_meta job_problem $job;
-	  my %files = %{$meta->{files}};
+	  my %files = exists $meta->{files} ? %{$meta->{files}} : ();
 	  $meta = {%$meta, %$pbmeta};
 	  $meta->{files} = {%files, %{$pbmeta->{files}}} if exists $pbmeta->{files};
 	}
 
 	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 +124,25 @@ 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;
-
-  my $log = $meta->{contest} ? "ct/$meta->{contest}/log" : 'log';
-  write_file "$log/src/$job." . Gruntmaster::Page::Log::FORMAT_EXTENSION->{$meta->{files}{prog}{format}}, $meta->{files}{prog}{content};
-  generate "$log/job/$job.html";
-  my $page = ($job + Gruntmaster::Page::Log::PAGE_SIZE - 1) / Gruntmaster::Page::Log::PAGE_SIZE;
-  generate "$log/$page.html"
+  set_job_errors $job, $errors;
+
+  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";
+  my $page = ($job + PAGE_SIZE - 1) / PAGE_SIZE;
+  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;
+	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;
@@ -149,7 +153,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;