X-Git-Url: http://git.ieval.ro/?p=gruntmaster-daemon.git;a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=a84fc57cfeb3dff949f0eef1ac3c02cf03240b29;hp=1c8ceceda53f8cd4d76e9084af41bbcdc3cde83c;hb=55e61ae897ee944a61d1a822170027cd376cec2a;hpb=5a4392d52560b78196572d6680cb76dadc6e2782 diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm index 1c8cece..a84fc57 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 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 => { @@ -35,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) = @_; @@ -55,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) = @_; @@ -147,13 +137,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{ @@ -173,6 +169,7 @@ sub got_job{ } sub run{ + require Gruntmaster::Data; $db = Gruntmaster::Data->connect('dbi:Pg:'); Log::Log4perl->init('/etc/gruntmasterd/gruntmasterd-log.conf'); get_logger->info("gruntmasterd $VERSION started");