X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=1d1ca01f9544c895168dd27e7ed356c3af2cebaf;hp=b7b6e0616a5192b7076412bed2c54f17da547d53;hb=fdb99417bb13ca0418a5ec8d9e240e29565225c4;hpb=6555bf80813ccd73357cbd9efa06cbef33230189

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index b7b6e06..1d1ca01 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -4,11 +4,10 @@ use 5.014000;
 use strict;
 use warnings;
 
-our $VERSION = '5999.000_003';
+our $VERSION = '5999.000_004';
 
 use Gruntmaster::Daemon::Constants qw/ERR/;
-use Gruntmaster::Daemon::Format qw/prepare_files/;
-use Gruntmaster::Data;
+use Gruntmaster::Daemon::Format qw/prepare_files stopvms/;
 
 use File::Basename qw/fileparse/;
 use File::Temp qw/tempdir/;
@@ -17,12 +16,14 @@ use Sys::Hostname qw/hostname/;
 use Time::HiRes qw/time/;
 use Try::Tiny;
 use Log::Log4perl qw/get_logger/;
-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',
@@ -32,9 +33,9 @@ use constant FORMAT_EXTENSION => {
 
 ##################################################
 
+sub purge;
+
 my $db;
-my $ua = LWP::UserAgent->new;
-my @purge_hosts = exists $ENV{PURGE_HOSTS} ? split ' ', $ENV{PURGE_HOSTS} : ();
 
 sub safe_can_nodie {
 	my ($type, $sub, $name) = @_;
@@ -52,14 +53,6 @@ sub safe_can {
 	safe_can_nodie @_ or get_logger->logdie("No such \l$type: '$name'");
 }
 
-sub purge {
-	get_logger->trace("Purging $_[0]");
-	for my $host (@purge_hosts) {
-		my $req = HTTP::Request->new(PURGE => "http://$host$_[0]");
-		$ua->request($req)
-	}
-}
-
 sub process{
 	my ($job, $jobr) = @_;
 
@@ -134,6 +127,7 @@ sub process{
 		$meta->{result} = -1;
 		$meta->{result_text} = $_;
 	};
+	stopvms;
 
 	get_logger->info("Job result: " . $meta->{result_text});
 	return unless $jobr;
@@ -144,13 +138,19 @@ sub process{
 		$errors ? (errors => $errors) : ()
 	});
 
-	my $log = $jobr->contest ? 'ct/' . $jobr->contest->id . '/log' : 'log';
-	my $page = int (($job + PAGE_SIZE - 1) / PAGE_SIZE);
-
-	purge "/$log/$job";
-	purge "/$log/";
-	purge "/$log/st";
-	purge "/$log/page/$_" for $page - 1, $page, $page + 1;
+	my $solved = $meta->{result} ? 0 : 1;
+	my $status = $db->problem_statuses->find($jobr->owner, $jobr->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;
 }
 
 sub got_job{
@@ -170,6 +170,8 @@ sub got_job{
 }
 
 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:');
 	Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf');
 	get_logger->info("gruntmasterd $VERSION started");