From 0e65917503a37e661826a3eaa521a22b5d31c38a Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Mon, 7 Jan 2008 03:59:27 +0000 Subject: basic support for sending both stdout and stderr svn path=/branches/new-fu/; revision=344 --- server/scireserver.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/scireserver.pl b/server/scireserver.pl index f577f1e..fa5de61 100755 --- a/server/scireserver.pl +++ b/server/scireserver.pl @@ -94,12 +94,12 @@ while(<>) { set_job_status($jobid,$client_id,$status) and print "OK\n"; } elsif ($command eq "RETURN_JOBFILE") { my $jobid = $args[0]; - my $filename = "$conf{job_dir}/$client_id/result/$jobid.result"; - print "OK ${filename}\n"; + my @filenames = ("$conf{job_dir}/$client_id/result/$jobid.stdout", "$conf{job_dir}/$client_id/result/$jobid.stderr"); + print "OK " . join(" ", @filenames) . "\n"; } elsif ($command eq "JOBFILE_SENT") { - my $filename = $args[0]; - print "OK\n" and process_jobfile($filename); - + my @filenames = @args; + process_jobfile($_) foreach(@jobfiles); + print "OK\n" } else { print "ERROR The command $command is unknown. Please try again.\n"; } -- cgit v1.2.3