Support problem parameters outside meta

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

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index c3ee5914c5cd5244bfe28ac5d38aefbd7bf0c596..7166a4238a5d4809ed0b2cf49d1584af48242fae 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -4,27 +4,27 @@ use 5.014000;
 use strict;
 use warnings;
 
-our $VERSION = '0.001';
+our $VERSION = '5999.000_001';
 
 use Gruntmaster::Daemon::Constants qw/ERR/;
-use Gruntmaster::Daemon::Format qw/mkrun/;
+use Gruntmaster::Daemon::Format qw/prepare_files/;
 use Gruntmaster::Data;
-use Gruntmaster::Page::Log;
 
 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 LWP::UserAgent;
+
+use constant PAGE_SIZE => 10;
 
 ##################################################
 
+my $ua = LWP::UserAgent->new;
+my @purge_hosts = exists $ENV{PURGE_HOSTS} ? split ' ', $ENV{PURGE_HOSTS} : ();
+
 sub safe_can_nodie {
   my ($type, $sub, $name) = @_;
 
@@ -41,27 +41,11 @@ sub safe_can {
   safe_can_nodie @_ or get_logger->logdie("No such \l$type: '$name'");
 }
 
-sub prepare{
-  my ($name, $format) = @_;
-  our $errors;
-  my $basename = fileparse $name, qr/\.[^.]*/;
-  get_logger->trace("Preparing file $name...");
-
-  $errors .= `gruntmaster-compile $format $basename $name 2>&1`;
-  $errors .= "\n";
-  die 'Compile error' if $?
-}
-
-sub prepare_files{
-  my $meta = shift;
-
-  for my $file (values $meta->{files}) {
-       my ($format, $name, $content) = @{$file}{qw/format name content/};
-
-       $file->{run} = mkrun($format);
-       write_file $name, $content;
-       prepare $name, $format;
-  }
+sub purge {
+       for my $host (@purge_hosts) {
+               my $req = HTTP::Request->new(PURGE => "http://$host$_[0]");
+               $ua->request($req)
+       }
 }
 
 sub process{
@@ -74,9 +58,19 @@ sub process{
   try {
        $meta = job_inmeta $job;
        if (job_problem $job) {
-         my $pbmeta = problem_meta job_problem $job;
-         my %files = %{$meta->{files}};
-         $meta = {%$meta, %$pbmeta};
+         local $_ = job_problem $job;
+         my $pbmeta = problem_meta;
+         my %files = exists $meta->{files} ? %{$meta->{files}} : ();
+         $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};
        }
 
@@ -130,14 +124,20 @@ sub process{
   set_job_errors $job, $errors;
 
   my $log = $Gruntmaster::Data::contest ? "ct/$Gruntmaster::Data::contest/log" : 'log';
-  PUBLISH gensrc => "$Gruntmaster::Data::contest.$job";
+
+  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 + Gruntmaster::Page::Log::PAGE_SIZE - 1) / Gruntmaster::Page::Log::PAGE_SIZE;
+  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";
+
+  purge "/$log/job/$job";
+  purge "/$log/";
+  purge "/$log/st";
+  purge "/$log/$_" for $page - 1, $page, $page + 1;
 }
 
 sub got_job{
@@ -164,48 +164,32 @@ sub run{
 
 1;
 __END__
-# Below is stub documentation for your module. You'd better edit it!
 
 =head1 NAME
 
-Gruntmaster::Daemon - Perl extension for blah blah blah
+Gruntmaster::Daemon - Gruntmaster 6000 Online Judge -- daemon
 
 =head1 SYNOPSIS
 
   use Gruntmaster::Daemon;
-  blah blah blah
+  Gruntmaster::Daemon->run;
 
 =head1 DESCRIPTION
 
-Stub documentation for Gruntmaster::Daemon, created by h2xs. It looks like the
-author of the extension was negligent enough to leave the stub
-unedited.
-
-Blah blah blah.
-
-
-=head1 SEE ALSO
-
-Mention other useful documentation such as the documentation of
-related modules or operating system documentation (such as man pages
-in UNIX), or any relevant external documentation such as RFCs or
-standards.
-
-If you have a mailing list set up for your module, mention it here.
-
-If you have a web site set up for your module, mention it here.
+Gruntmaster::Daemon is the daemon component of the Gruntmaster 6000 online judge.
 
 =head1 AUTHOR
 
-Marius Gavrilescu, E<lt>marius@E<gt>
+Marius Gavrilescu E<lt>marius@ieval.roE<gt>
 
 =head1 COPYRIGHT AND LICENSE
 
-Copyright (C) 2013 by Marius Gavrilescu
+Copyright (C) 2014 by Marius Gavrilescu
 
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself, either Perl version 5.18.1 or,
-at your option, any later version of Perl 5 you may have available.
+This library is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 
 =cut