X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=1e5d8b2874ceb3cf3a1e24defc47c84d535cab45;hp=15f6410af68e779a182d4da4318df198472d6ba0;hb=01d5951581c7d82b42a3cc78942287ead79d2ca3;hpb=b335c4bbcd278396e05c11d9bf60e0807a78726d

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 15f6410..1e5d8b2 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -7,8 +7,7 @@ use warnings;
 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,7 +16,6 @@ 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 => {
@@ -36,14 +34,11 @@ use constant FORMAT_EXTENSION => {
 ##################################################
 
 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) = @_;
 
-	return unless $name =~ /^\w+$/;
-	no strict 'refs';
+	return unless $name =~ /^\w+$/s;
 	my $pkg = __PACKAGE__ . "::${type}::${name}";
 	eval "require $pkg" or get_logger->warn("Error while requiring $pkg: $@");
 	$pkg->can($sub);
@@ -55,14 +50,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) = @_;
 
@@ -97,7 +84,7 @@ sub process{
 		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: $_\n"} qw/files generator runner judge testcnt/;
 
 		$generator = safe_can Generator => generate => $generator;
 		$runner = safe_can Runner => run => $runner;
@@ -132,13 +119,14 @@ sub process{
 		$meta->{$_} = $results{$_} for keys %results;
 		$meta->{results} = \@full_results
 	} catch {
-		s,(.*) at .*,$1,;
+		s/(.*) at .*/$1/s;
 		chomp;
 		$meta->{result} = -1;
 		$meta->{result_text} = $_;
 	};
+	stopvms;
 
-	get_logger->info("Job result: " . $meta->{result_text});
+	get_logger->info('Job result: ' . $meta->{result_text});
 	return unless $jobr;
 	$jobr->update({
 		result => $meta->{result},
@@ -153,15 +141,7 @@ sub process{
 		problem => $jobr->problem,
 		owner   => $jobr->owner,
 		job     => $jobr->id,
-		solved  => $solved});
-
-	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;
+		solved  => $solved}) if !$jobr->problem->private;
 }
 
 sub got_job{
@@ -181,10 +161,13 @@ sub got_job{
 }
 
 sub run{
-	$db = Gruntmaster::Data->connect('dbi:Pg:');
+	require Gruntmaster::Data;
+	$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;