X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=ce8510d90320e628c0ea2463acbadb11e7845a45;hp=64f82312df71b5edde5d6e4dde3c0003e76be960;hb=c4d90e6f4a1d14b1b898c28d6787a06c8dfa2a90;hpb=99d3711026b621247d46551b38f19c34f26342bd

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 64f8231..ce8510d 100644
--- 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 File::Basename qw/fileparse/;
 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 constant PAGE_SIZE => 10;
 use constant FORMAT_EXTENSION => {
 	C => 'c',
 	CPP => 'cpp',
@@ -29,60 +27,30 @@ use constant FORMAT_EXTENSION => {
 	PASCAL => 'pas',
 	PERL => 'pl',
 	PYTHON => 'py',
+	RUBY => 'rb',
+	SBCL => 'l',
 };
 
 ##################################################
 
-sub purge;
-
 my $db;
 
-sub safe_can_nodie {
+sub safe_can {
 	my ($type, $sub, $name) = @_;
 
-	return unless $name =~ /^\w+$/s;
+	get_logger->logdie("Invalid \l$type: '$name'") unless $name =~ /^\w+$/s;
 	my $pkg = __PACKAGE__ . "::${type}::${name}";
 	eval "require $pkg" or get_logger->warn("Error while requiring $pkg: $@");
-	$pkg->can($sub);
-}
-
-sub safe_can {
-	my ($type, $sub, $name) = @_;
-
-	safe_can_nodie @_ or get_logger->logdie("No such \l$type: '$name'");
+	$pkg->can($sub) or get_logger->logdie("No such \l$type: '$name'");
 }
 
 sub process{
-	my ($job, $jobr) = @_;
+	my ($meta) = @_;
 
 	my @results;
 	my @full_results = ();
-	my $meta;
 	our $errors = '';
 	try {
-		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';
-
-			$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;
 
@@ -127,29 +95,51 @@ sub process{
 		$meta->{result_text} = $_;
 	};
 	stopvms;
+	$meta->{errors} = $errors;
 
 	get_logger->info('Job result: ' . $meta->{result_text});
-	return unless $jobr;
-	$jobr->update({
+}
+
+sub process_job {
+	my ($job) = @_;
+	my $meta = {
+		problem => $job->problem->id,
+		files => {
+			prog => {
+				name => 'prog.' . $job->extension,
+				format => $job->format,
+				content => $job->source,
+			},
+		},
+		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';
+	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},
+		format => $job->problem->verformat,
+		content => $job->problem->versource,
+	} if $job->problem->verformat;
+
+	process $meta;
+
+	$meta->{result_text} .= ' (pretests)' if $meta->{precnt};
+	$job->update({
 		result => $meta->{result},
 		result_text => $meta->{result_text},
 		($meta->{results} ? (results => encode_json $meta->{results}) : ()),
-		$errors ? (errors => $errors) : ()
+		$meta->{errors} ? (errors => $meta->{errors}) : ()
 	});
 
 	my $solved = $meta->{result} ? 0 : 1;
-	my $status = $db->problem_statuses->find($jobr->owner, $jobr->problem);
+	my $status = $db->problem_statuses->find($job->owner, $job->problem);
 	$db->problem_statuses->update_or_create({
-		problem => $jobr->problem,
-		owner   => $jobr->owner,
-		job     => $jobr->id,
-		solved  => $solved});
-
-	purge '/log/';
-	purge "/log/$job";
-	purge '/st/' . $jobr->contest if $jobr->contest;
-	purge '/us/';
-	purge '/us/' . $jobr->owner;
+		problem => $job->problem,
+		owner   => $job->owner,
+		job     => $job->id,
+		solved  => $solved}) if !$job->problem->is_private;
 }
 
 sub got_job{
@@ -157,24 +147,24 @@ sub got_job{
 	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 $id, $job;
+		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);
 	}
 }
 
 sub run{
-	warn "No GRUNTMASTER_VM environment variable. Running without a VM is a security risk.\n"  unless $ENV{GRUNTMASTER_VM};
 	require Gruntmaster::Data;
-	$db = Gruntmaster::Data->connect('dbi:Pg:');
+	$db = Gruntmaster::Data->connect($ENV{GRUNTMASTER_DSN} // 'dbi:Pg:');
 	Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf');
 	get_logger->info("gruntmasterd $VERSION started");
-	chdir tempdir 'gruntmasterd.XXXX', CLEANUP => 1, TMPDIR => 1;
+	my $dir = tempdir 'gruntmasterd.XXXX', CLEANUP => 1, TMPDIR => 1;
+	chmod 0711, $dir;
+	chdir $dir;
 	while (1) {
 		my $job = $db->jobs->search({daemon => undef}, {rows => 1})->first;
 		got_job $job if defined $job;