X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=78b39e4c3f3ee6ad29328b3303db1907c78f658d;hp=40529b26d505a6cf7019c6e9d4f4b38bd0260c71;hb=7ddb70a9176040416f7a4624c98d205cd224c5a8;hpb=3f07cf69f93b1aba2729103ea7ecf71cfc23d884

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 40529b2..78b39e4 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -8,8 +8,8 @@ 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::Page::Log;
 
 use File::Basename qw/fileparse/;
 use File::Slurp qw/write_file/;
@@ -22,7 +22,6 @@ use Time::HiRes qw/time/;
 use Try::Tiny;
 use YAML::Any qw/LoadFile DumpFile/;
 use Log::Log4perl qw/get_logger/;
-use Data::Dumper qw/Dumper/;
 
 ##################################################
 
@@ -84,7 +83,6 @@ sub process{
 	}
 
 	prepare_files $meta;
-	say Dumper $meta;
 
 	my ($files, $generator, $runner, $judge, $testcnt) = map { $meta->{$_} or die "Required parameter missing: $_"} qw/files generator runner judge testcnt/;
 
@@ -132,10 +130,11 @@ sub process{
   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";
+  PUBLISH gensrc => $job;
+  PUBLISH genpage => "$log/job/$job.html";
+  PUBLISH genpage => "$log/index.html";
   my $page = ($job + Gruntmaster::Page::Log::PAGE_SIZE - 1) / Gruntmaster::Page::Log::PAGE_SIZE;
-  generate "$log/$page.html"
+  PUBLISH genpage => "$log/$page.html"
 }
 
 sub got_job{
@@ -151,7 +150,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;