projects
/
gruntmaster-daemon.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add ruby
[gruntmaster-daemon.git]
/
lib
/
Gruntmaster
/
Daemon.pm
diff --git
a/lib/Gruntmaster/Daemon.pm
b/lib/Gruntmaster/Daemon.pm
index 3a836924afebea26ff627c55c4fa342365332fcd..ce8510d90320e628c0ea2463acbadb11e7845a45 100644
(file)
--- a/
lib/Gruntmaster/Daemon.pm
+++ b/
lib/Gruntmaster/Daemon.pm
@@
-9,7
+9,6
@@
our $VERSION = '5999.000_004';
use Gruntmaster::Daemon::Constants qw/ERR/;
use Gruntmaster::Daemon::Format qw/prepare_files stopvms/;
use Gruntmaster::Daemon::Constants qw/ERR/;
use Gruntmaster::Daemon::Format qw/prepare_files stopvms/;
-use File::Basename qw/fileparse/;
use File::Temp qw/tempdir/;
use JSON qw/decode_json encode_json/;
use Sys::Hostname qw/hostname/;
use File::Temp qw/tempdir/;
use JSON qw/decode_json encode_json/;
use Sys::Hostname qw/hostname/;
@@
-17,7
+16,6
@@
use Time::HiRes qw/time/;
use Try::Tiny;
use Log::Log4perl qw/get_logger/;
use Try::Tiny;
use Log::Log4perl qw/get_logger/;
-use constant PAGE_SIZE => 10;
use constant FORMAT_EXTENSION => {
C => 'c',
CPP => 'cpp',
use constant FORMAT_EXTENSION => {
C => 'c',
CPP => 'cpp',
@@
-29,6
+27,8
@@
use constant FORMAT_EXTENSION => {
PASCAL => 'pas',
PERL => 'pl',
PYTHON => 'py',
PASCAL => 'pas',
PERL => 'pl',
PYTHON => 'py',
+ RUBY => 'rb',
+ SBCL => 'l',
};
##################################################
};
##################################################
@@
-111,9
+111,11
@@
sub process_job {
content => $job->source,
},
},
content => $job->source,
},
},
- map { $_ => $job->problem->get_column($_) } qw/generator runner judge testcnt timeout olimit/
+ map { $_ => $job->problem->get_column($_) } qw/generator runner judge
precnt
testcnt timeout olimit/
};
$meta->{tests} = decode_json $job->problem->tests if $meta->{runner} eq 'File';
};
$meta->{tests} = decode_json $job->problem->tests if $meta->{runner} eq 'File';
+ delete $meta->{precnt} if $job->problem->is_in_archive;
+ $meta->{testcnt} = $meta->{precnt} if $meta->{precnt};
$meta->{files}{ver} = {
name => 'ver.' . FORMAT_EXTENSION->{$job->problem->verformat},
$meta->{files}{ver} = {
name => 'ver.' . FORMAT_EXTENSION->{$job->problem->verformat},
@@
-123,6
+125,7
@@
sub process_job {
process $meta;
process $meta;
+ $meta->{result_text} .= ' (pretests)' if $meta->{precnt};
$job->update({
result => $meta->{result},
result_text => $meta->{result_text},
$job->update({
result => $meta->{result},
result_text => $meta->{result_text},
@@
-144,14
+147,13
@@
sub got_job{
my $id = $job->id;
get_logger->debug("Taking job $id...");
my $daemon = hostname . ":$$";
my $id = $job->id;
get_logger->debug("Taking job $id...");
my $daemon = hostname . ":$$";
- $job->update({daemon => $daemon});
- #if (set_job_daemon $job, hostname . ":$$") {
- if (1) {
+ $job->update({daemon => $daemon}, {where => {daemon => undef}})->discard_changes;
+ if ($job->daemon eq $daemon) {
get_logger->debug("Succesfully taken job $id");
process_job $job;
get_logger->debug("Job $id done");
} else {
get_logger->debug("Succesfully taken job $id");
process_job $job;
get_logger->debug("Job $id done");
} else {
- get_logger->debug("Job $id already taken
"
);
+ get_logger->debug("Job $id already taken
by " . $job->daemon
);
}
}
}
}
This page took
0.011003 seconds
and
4
git commands to generate.