Unlink fifo1 & fifo2 after each test

[gruntmaster-daemon.git] / lib / Gruntmaster / Daemon.pm

diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm
index 35103a5e57dcf7e25ff5b2f7bff496b64f22df95..7fef7f68dd6334508d1fe09732aa61c4557b4a08 100644 (file)
--- a/lib/Gruntmaster/Daemon.pm
+++ b/lib/Gruntmaster/Daemon.pm
@@ -20,6 +20,15 @@ use Log::Log4perl qw/get_logger/;
 use LWP::UserAgent;
 
 use constant PAGE_SIZE => 10;
+use constant FORMAT_EXTENSION => {
+       C => 'c',
+       CPP => 'cpp',
+       MONO => 'cs',
+       JAVA => 'java',
+       PASCAL => 'pas',
+       PERL => 'pl',
+       PYTHON => 'py',
+};
 
 ##################################################
 
@@ -73,7 +82,7 @@ sub process{
                $meta->{tests} = decode_json $jobr->problem->tests if $meta->{runner} eq 'File';
 
                $meta->{files}{ver} = {
-                       name => 'ver.cpp',
+                       name => 'ver.' . FORMAT_EXTENSION->{$jobr->problem->verformat},
                        format => $jobr->problem->verformat,
                        content => $jobr->problem->versource,
                } if $jobr->problem->verformat;
@@ -130,7 +139,7 @@ sub process{
        });
 
        my $log = $jobr->contest ? 'ct/' . $jobr->contest->id . '/log' : 'log';
-       my $page = ($job + PAGE_SIZE - 1) / PAGE_SIZE;
+       my $page = int (($job + PAGE_SIZE - 1) / PAGE_SIZE);
 
        purge "/$log/$job";
        purge "/$log/";