X-Git-Url: http://git.ieval.ro/?a=blobdiff_plain;f=lib%2FGruntmaster%2FDaemon.pm;h=7285c96cb69e5eda7ed8fa9e60fd1d731b2544f1;hb=refs%2Fheads%2Fscaleway;hp=1c820dbe6429c508946e89c80fee3d77b76c1106;hpb=e172b8d90d22950ff496364fd06a6c2e9b33eb61;p=gruntmaster-daemon.git diff --git a/lib/Gruntmaster/Daemon.pm b/lib/Gruntmaster/Daemon.pm index 1c820db..7285c96 100644 --- a/lib/Gruntmaster/Daemon.pm +++ b/lib/Gruntmaster/Daemon.pm @@ -7,7 +7,8 @@ use warnings; our $VERSION = '5999.000_005'; use Gruntmaster::Daemon::Constants qw/ERR/; -use Gruntmaster::Daemon::Format qw/prepare_files stopvms/; +use Gruntmaster::Daemon::Format qw/prepare_files copy_from_vm stopvms/; +use Gruntmaster::SendResults qw/send_results_request/; use File::Slurp qw/read_file/; use File::Temp qw/tempdir/; @@ -26,6 +27,7 @@ use constant FORMAT_EXTENSION => { GOLFSCRIPT => 'gs', HASKELL => 'hs', JAVA => 'java', + JAVASCRIPT => 'js', JULIA => 'jl', MONO => 'cs', OBERON => 'm', @@ -86,6 +88,7 @@ sub process{ unlink 'time-start-prog', 'time-stop-prog'; if (ref $result) { my $result_text = $result->[1]; + copy_from_vm 'result'; $result_text .= ': ' . read_file 'result' if -s 'result'; get_logger->trace("Test $test result is " . $result_text); push @full_results, {id => $test, result => $result->[0], result_text => $result_text, time => $time} @@ -110,6 +113,7 @@ sub process{ $meta->{errors} = $errors; get_logger->info('Job result: ' . $meta->{result_text}); + send_results_request($meta->{job_id}, $meta->{result}, $meta->{result_text}); } sub process_job { @@ -138,6 +142,7 @@ sub process_job { format => $pb->{verformat}, content => $pb->{versource}, } if $pb->{verformat}; + $meta->{job_id} = $job->{id}; process $meta;