arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enabled stream back of verbose output

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@142 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
sakolish 2007-12-06 16:36:32 +00:00
parent 4c965b38aa
commit 406c4e09ff
1 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
perl-xCAT-2.0/xCAT/PPC.pm
View File

@ -54,6 +54,7 @@ sub send_msg {
$output{data} = \@_;
print $out freeze( [\%output] );
print $out "\nENDOFFREEZE6sK4ci\n";
}
#################################################
# Called from parent - invoke callback directly
@ -123,12 +124,27 @@ sub process_command {
}
if ( exists( $request->{verbose} )) {
my $elapsed = Time::HiRes::gettimeofday() - $start;
printf STDERR "Total Elapsed Time: %.3f sec\n", $elapsed;
my $msg = sprintf( "Total Elapsed Time: %.3f sec\n", $elapsed );
trace( $request, $msg );
}
return(0);
}
##########################################################################
# Verbose mode (-V)
##########################################################################
sub trace {
my $request = shift;
my $msg = shift;
my ($sec,$min,$hour,$mday,$mon,$yr,$wday,$yday,$dst) = localtime(time);
my $msg = sprintf "%02d:%02d:%02d %5d %s", $hour,$min,$sec,$$,$msg;
send_msg( $request, $msg );
}
##########################################################################
# Send response from child process back to xCAT client
##########################################################################
@ -142,21 +158,24 @@ sub child_response {
my $data;
#################################
# Read from child
# Read from child process
#################################
while (<$rfh>) {
$data.= $_;
if ( $data = <$rfh> ) {
while ($data !~ /ENDOFFREEZE6sK4ci/) {
$data .= <$rfh>;
}
my $responses = thaw($data);
foreach ( @$responses ) {
$callback->( $_ );
}
next;
}
#################################
# Command results
# Done - close handle
#################################
my $responses = thaw($data);
foreach (@$responses) {
$callback->($_);
}
$fds->remove($rfh);
close($rfh);
}
}
}
@ -495,6 +514,7 @@ sub invoke_cmd {
my $out = $request->{pipe};
print $out freeze( $result );
print $out "\nENDOFFREEZE6sK4ci\n";
return;
}
########################################
@ -522,6 +542,13 @@ sub invoke_cmd {
########################################
my $result = runcmd( $request, $nodes, \@exp );
########################################
# Output verbose Expect
########################################
if ( $verbose ) {
my $expect_log = $exp[6];
send_msg( $request, $$expect_log );
}
########################################
# Close connection to remote server
########################################
@ -537,10 +564,11 @@ sub invoke_cmd {
########################################
# Send result back to parent process
########################################
if ( @$result[0] eq "FORMATTED_DATA" ) {
if ( @$result[0] eq "FORMATDATA6sK4ci" ) {
shift(@$result);
my $out = $request->{pipe};
print $out freeze( [@$result] );
print $out "\nENDOFFREEZE6sK4ci\n";
return;
}
########################################
@ -554,6 +582,7 @@ sub invoke_cmd {
}
my $out = $request->{pipe};
print $out freeze( [@outhash] );
print $out "\nENDOFFREEZE6sK4ci\n";
}
@ -649,3 +678,4 @@ sub process_request {
1;