--- lib/PXElator/httpd.pm 2009/07/31 18:26:28 89 +++ lib/PXElator/httpd.pm 2009/07/31 20:45:09 96 @@ -61,15 +61,18 @@ my $size = -s $full || return; + $client->autoflush(1); + print $client "HTTP/1.0 200 OK\r\nContent-Type: $type\r\nContent-Length: $size\r\nConnection: close\r\n\r\n"; open(my $fh, $full); - print "static $path $type $size\n"; - my $block = 8192; + my $block = 1400; # try not to fragment packages (pxelinux seems to have problems with it) my $buff; my $pos = 0; + print "static $path $type $size block: $block\n"; + while( my $len = read $fh, $buff, $block ) { print $client $buff; $pos += $len; @@ -78,7 +81,7 @@ close($fh); close($client); - print "$path $pos == $size OK\n"; + print "\n"; exit; } @@ -94,7 +97,7 @@ my $daemon = shift; my $pid = $pids->{$daemon}; - warn "start_stop $daemon $pid pids: ",dump( $pids ); + warn "start_stop $daemon $pid\n"; if ( $pid =~ m{^\d+$} ) { my $pstree = `pstree -p $pid`; @@ -107,7 +110,7 @@ if ( $pid = fork ) { # parent $pids->{$daemon} = $pid; - warn "forked $daemon $pid"; + warn "forked $daemon $pid\n"; return qq|$daemon pid $pid started|; } elsif ( defined $pid ) { # child @@ -130,7 +133,7 @@ sub get_request { my ( $client, $path, $param ) = @_; - warn "get_request $client $path ",dump( $param ); + warn "get_request $path ", $param ? dump( $param ) : '', "\n"; if ( my $found = static( $client,$path ) ) { warn "static $found" if $debug; @@ -147,7 +150,7 @@ 'debug', qq|$debug|, ); - my $debug_proc; + my $debug_proc = ''; warn 'pids: ', dump( $pids ) if $debug; foreach my $name ( sort keys %$pids ) { @@ -180,18 +183,24 @@ push @rows, ( $name => $html ); } + my $below_table = ''; + warn 'static_pids: ', dump( $static_pids ) if $debug; foreach my $pid ( keys %$static_pids ) { my $path = $static_pids->{$pid}; if ( -d "/proc/$pid" ) { push @rows, ( $path => qq|$pid| ); + } elsif ( $param->{clean_completed_downloads} ) { + delete $static_pids->{$pid} } else { push @rows, ( $path => "$pid competed" ); + $below_table = qq|clean completed downloads|; } } print $client $ok , html::table( 2, @rows ) + , $below_table , html::tabs( log::mac_changes ) , $debug_proc ; @@ -262,7 +271,6 @@ } warn "param: ",dump( $param ) if $debug; } - warn "path $path param: ",dump( $param ); get_request $client, $path, $param; } else { print $client "HTTP/1.0 500 No method\r\nConnection: close\r\nContent-type: text/plain\r\n\r\n500 $request";