Regenerate standings and log after job

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon.pm

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 1d8cb8b41c80b18cebba926f702ca670e05e6c45..ed8e405ae37f603a30f495701aa456426a056759 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -8,23 +8,20 @@ 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/;
+use Gruntmaster::Data;
+use Gruntmaster::Page::Log;
 
-use Cwd qw/cwd/;
 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 Redis;
 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 Data::Dumper qw/Dumper/;
 
 ##################################################
 
@@ -70,12 +67,8 @@ sub prepare_files{
   }
 }
 
-my $tempdir;
-
 sub process{
   my $job = shift;
-  my $rootdir = cwd;
-  chdir $tempdir;
 
   my @results;
   my @full_results = ();
@@ -90,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/;
 
@@ -137,12 +129,15 @@ sub process{
   set_job_result_text $job, $meta->{result_text};
   set_job_results $job, \@full_results if scalar @full_results;
 
-  chdir $rootdir;
   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";
+  PUBLISH genpage => "$log/st.html";
   my $page = ($job + Gruntmaster::Page::Log::PAGE_SIZE - 1) / Gruntmaster::Page::Log::PAGE_SIZE;
-  generate "$log/$page.html"
+  PUBLISH genpage => "$log/@{[$page - 1]}.html";
+  PUBLISH genpage => "$log/$page.html";
+  PUBLISH genpage => "$log/@{[$page + 1]}.html";
 }
 
 sub got_job{
@@ -158,12 +153,11 @@ sub got_job{
 }
 
 sub run{
-  Log::Log4perl->init('log.conf');
+  Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf');
   get_logger->info("gruntmasterd $VERSION started");
-  $tempdir = tempdir 'gruntmasterd.XXXX', CLEANUP => 1, TMPDIR => 1;
-  my $redis = Redis->new;
-  $redis->subscribe('jobs', \&got_job);
-  $redis->wait_for_messages(0) while 1
+  chdir tempdir 'gruntmasterd.XXXX', CLEANUP => 1, TMPDIR => 1;
+  SUBSCRIBE jobs => \&got_job;
+  WAIT_FOR_MESSAGES 86400 while 1
 }
 
 1;