use strict;
use warnings;
-our $VERSION = '5999.000_002';
+our $VERSION = '5999.000_004';
use Gruntmaster::Daemon::Constants qw/ERR/;
use Gruntmaster::Daemon::Format qw/prepare_files/;
use LWP::UserAgent;
use constant PAGE_SIZE => 10;
+use constant FORMAT_EXTENSION => {
+ C => 'c',
+ CPP => 'cpp',
+ GCCGO => 'go',
+ GOLANG => 'go',
+ HASKELL => 'hs',
+ MONO => 'cs',
+ JAVA => 'java',
+ PASCAL => 'pas',
+ PERL => 'pl',
+ PYTHON => 'py',
+};
##################################################
-my $db = Gruntmaster::Data->connect('dbi:Pg:');
+my $db;
my $ua = LWP::UserAgent->new;
my @purge_hosts = exists $ENV{PURGE_HOSTS} ? split ' ', $ENV{PURGE_HOSTS} : ();
}
sub purge {
+ get_logger->trace("Purging $_[0]");
for my $host (@purge_hosts) {
my $req = HTTP::Request->new(PURGE => "http://$host$_[0]");
$ua->request($req)
my $meta;
our $errors = '';
try {
- $meta = {
- problem => $jobr->problem->id,
- files => {
- prog => {
- name => 'prog.' . $jobr->extension,
- format => $jobr->format,
- content => $jobr->source,
+ if (ref $job) {
+ $meta = $job;
+ } else {
+ $meta = {
+ problem => $jobr->problem->id,
+ files => {
+ prog => {
+ name => 'prog.' . $jobr->extension,
+ format => $jobr->format,
+ content => $jobr->source,
+ },
},
- },
- map { $_ => $jobr->problem->get_column($_) } qw/generator runner judge testcnt timeout olimit/
- };
- $meta->{tests} = decode_json $jobr->problem->tests if $meta->{runner} eq 'File';
+ map { $_ => $jobr->problem->get_column($_) } qw/generator runner judge testcnt timeout olimit/
+ };
+ $meta->{tests} = decode_json $jobr->problem->tests if $meta->{runner} eq 'File';
- $meta->{files}{ver} = {
- name => 'ver.cpp',
- format => $jobr->problem->verformat,
- content => $jobr->problem->versource,
- } if $jobr->problem->verformat;
+ $meta->{files}{ver} = {
+ name => 'ver.' . FORMAT_EXTENSION->{$jobr->problem->verformat},
+ format => $jobr->problem->verformat,
+ content => $jobr->problem->versource,
+ } if $jobr->problem->verformat;
+ }
prepare_files $meta;
chomp $errors;
my %results = $judge->(@results);
$meta->{$_} = $results{$_} for keys %results;
+ $meta->{results} = \@full_results
} catch {
s,(.*) at .*,$1,;
chomp;
};
get_logger->info("Job result: " . $meta->{result_text});
+ return unless $jobr;
$jobr->update({
result => $meta->{result},
result_text => $meta->{result_text},
- results => encode_json \@full_results,
+ ($meta->{results} ? (results => encode_json $meta->{results}) : ()),
$errors ? (errors => $errors) : ()
});
- my $log = $jobr->contest ? 'ct/' . $jobr->contest . '/log' : 'log';
- my $page = ($job + PAGE_SIZE - 1) / PAGE_SIZE;
+ my $log = $jobr->contest ? 'ct/' . $jobr->contest->id . '/log' : 'log';
+ my $page = int (($job + PAGE_SIZE - 1) / PAGE_SIZE);
purge "/$log/$job";
purge "/$log/";
}
sub run{
+ $db = Gruntmaster::Data->connect('dbi:Pg:');
Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf');
get_logger->info("gruntmasterd $VERSION started");
chdir tempdir 'gruntmasterd.XXXX', CLEANUP => 1, TMPDIR => 1;