projects
/
gruntmaster-daemon.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
738dd65
)
Do not depend on Gruntmaster::Page anymore
author
Marius Gavrilescu
<marius@ieval.ro>
Fri, 31 Jan 2014 13:21:19 +0000
(15:21 +0200)
committer
Marius Gavrilescu
<marius@ieval.ro>
Fri, 31 Jan 2014 13:21:19 +0000
(15:21 +0200)
lib/Gruntmaster/Daemon.pm
patch
|
blob
|
blame
|
history
diff --git
a/lib/Gruntmaster/Daemon.pm
b/lib/Gruntmaster/Daemon.pm
index c3ee5914c5cd5244bfe28ac5d38aefbd7bf0c596..5c5c19ed669b90d549916292a18dcfdb2c4b3fc4 100644
(file)
--- a/
lib/Gruntmaster/Daemon.pm
+++ b/
lib/Gruntmaster/Daemon.pm
@@
-9,7
+9,6
@@
our $VERSION = '0.001';
use Gruntmaster::Daemon::Constants qw/ERR/;
use Gruntmaster::Daemon::Format qw/mkrun/;
use Gruntmaster::Data;
use Gruntmaster::Daemon::Constants qw/ERR/;
use Gruntmaster::Daemon::Format qw/mkrun/;
use Gruntmaster::Data;
-use Gruntmaster::Page::Log;
use File::Basename qw/fileparse/;
use File::Slurp qw/write_file/;
use File::Basename qw/fileparse/;
use File::Slurp qw/write_file/;
@@
-23,6
+22,8
@@
use Try::Tiny;
use YAML::Any qw/LoadFile DumpFile/;
use Log::Log4perl qw/get_logger/;
use YAML::Any qw/LoadFile DumpFile/;
use Log::Log4perl qw/get_logger/;
+use constant PAGE_SIZE => 10;
+
##################################################
sub safe_can_nodie {
##################################################
sub safe_can_nodie {
@@
-75,7
+76,7
@@
sub process{
$meta = job_inmeta $job;
if (job_problem $job) {
my $pbmeta = problem_meta job_problem $job;
$meta = job_inmeta $job;
if (job_problem $job) {
my $pbmeta = problem_meta job_problem $job;
- my %files =
%{$meta->{files}}
;
+ my %files =
exists $meta->{files} ? %{$meta->{files}} : ()
;
$meta = {%$meta, %$pbmeta};
$meta->{files} = {%files, %{$pbmeta->{files}}} if exists $pbmeta->{files};
}
$meta = {%$meta, %$pbmeta};
$meta->{files} = {%files, %{$pbmeta->{files}}} if exists $pbmeta->{files};
}
@@
-130,11
+131,12
@@
sub process{
set_job_errors $job, $errors;
my $log = $Gruntmaster::Data::contest ? "ct/$Gruntmaster::Data::contest/log" : 'log';
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";
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";
PUBLISH genpage => "$log/@{[$page - 1]}.html";
PUBLISH genpage => "$log/$page.html";
PUBLISH genpage => "$log/@{[$page + 1]}.html";
This page took
0.011884 seconds
and
4
git commands to generate.