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

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 1d1ca01..1e5d8b2 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -33,15 +33,12 @@ use constant FORMAT_EXTENSION => {
 
 ##################################################
 
-sub purge;
-
 my $db;
 
 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);
@@ -87,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;
@@ -122,14 +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},
@@ -144,13 +141,7 @@ sub process{
 		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;
+		solved  => $solved}) if !$jobr->problem->private;
 }
 
 sub got_job{
@@ -170,12 +161,13 @@ 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:');
+	$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;