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

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 8a0048d..1e5d8b2 100644
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -33,8 +33,6 @@ use constant FORMAT_EXTENSION => {
 
 ##################################################
 
-sub purge;
-
 my $db;
 
 sub safe_can_nodie {
@@ -143,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{
@@ -169,13 +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;
-	Gruntmaster::Data->import;
-	$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;