projects
/
gruntmaster-daemon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Save compile errors
[gruntmaster-daemon.git]
/
lib
/
Gruntmaster
/
Daemon.pm
diff --git
a/lib/Gruntmaster/Daemon.pm
b/lib/Gruntmaster/Daemon.pm
index 6991b7a00a2481fa67971c225bacaf308dda20e1..73610b39f98896afdc912d706fa7203fcde68c67 100644
(file)
--- a/
lib/Gruntmaster/Daemon.pm
+++ b/
lib/Gruntmaster/Daemon.pm
@@
-8,7
+8,7
@@
our $VERSION = '0.001';
use Gruntmaster::Daemon::Constants qw/ERR/;
use Gruntmaster::Daemon::Format qw/mkrun/;
use Gruntmaster::Daemon::Constants qw/ERR/;
use Gruntmaster::Daemon::Format qw/mkrun/;
-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 Gruntmaster::Page::Log;
use File::Basename qw/fileparse/;
use Gruntmaster::Page::Log;
use File::Basename qw/fileparse/;
@@
-43,15
+43,12
@@
sub safe_can {
sub prepare{
my ($name, $format) = @_;
sub prepare{
my ($name, $format) = @_;
+ our $errors;
my $basename = fileparse $name, qr/\.[^.]*/;
get_logger->trace("Preparing file $name...");
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 $?
}
die 'Compile error' if $?
}
@@
-73,6
+70,7
@@
sub process{
my @results;
my @full_results = ();
my $meta = {};
my @results;
my @full_results = ();
my $meta = {};
+ our $errors = '';
try {
$meta = job_inmeta $job;
if (job_problem $job) {
try {
$meta = job_inmeta $job;
if (job_problem $job) {
@@
-83,6
+81,7
@@
sub process{
}
prepare_files $meta;
}
prepare_files $meta;
+ chomp $errors;
my ($files, $generator, $runner, $judge, $testcnt) = map { $meta->{$_} or die "Required parameter missing: $_"} qw/files generator runner judge testcnt/;
my ($files, $generator, $runner, $judge, $testcnt) = map { $meta->{$_} or die "Required parameter missing: $_"} qw/files generator runner judge testcnt/;
@@
-128,12
+127,17
@@
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;
set_job_result $job, $meta->{result};
set_job_result_text $job, $meta->{result_text};
set_job_results $job, \@full_results if scalar @full_results;
+ set_job_errors $job, $errors;
my $log = $meta->{contest} ? "ct/$meta->{contest}/log" : 'log';
PUBLISH gensrc => $job;
PUBLISH genpage => "$log/job/$job.html";
my $log = $meta->{contest} ? "ct/$meta->{contest}/log" : 'log';
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;
my $page = ($job + Gruntmaster::Page::Log::PAGE_SIZE - 1) / Gruntmaster::Page::Log::PAGE_SIZE;
- PUBLISH genpage => "$log/$page.html"
+ PUBLISH genpage => "$log/@{[$page - 1]}.html";
+ PUBLISH genpage => "$log/$page.html";
+ PUBLISH genpage => "$log/@{[$page + 1]}.html";
}
sub got_job{
}
sub got_job{
@@
-149,7
+153,7
@@
sub got_job{
}
sub run{
}
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;
get_logger->info("gruntmasterd $VERSION started");
chdir tempdir 'gruntmasterd.XXXX', CLEANUP => 1, TMPDIR => 1;
SUBSCRIBE jobs => \&got_job;
This page took
0.011509 seconds
and
4
git commands to generate.