--- lib/PXElator/httpd.pm 2009/07/30 22:44:55 70 +++ lib/PXElator/httpd.pm 2009/07/31 14:43:30 78 @@ -97,8 +97,10 @@ warn "start_stop $daemon $pid pids: ",dump( $pids ); if ( $pid =~ m{^\d+$} ) { - warn "kill 9 $pid"; - kill 9, $pid; + my $pstree = `pstree -p $pid`; + my @pids = $pstree =~ m{\((\d+)\)}g; + warn "pstree $pstree pids ",dump( @pids ); + kill 1, $_ foreach reverse @pids; $pids->{$daemon} = 'stopped'; return qq|$daemon pid $pid stopped|; } else { @@ -143,20 +145,29 @@ 'debug', qq|$debug|, ); - warn 'pids: ', dump( $pids ); + my $debug_proc; + + warn 'pids: ', dump( $pids ) if $debug; foreach my $name ( keys %$pids ) { my $pid = $pids->{$name} || next; - my $proc = "/proc/$pid/status"; my $html = qq|$pid|; - $html .= qq|
|
-					.  ( $debug && -e $proc ? read_file($proc) : '' )
-					.  qq|
| if $debug; + + if ( $debug ) { + $html .= qq| ?|; + + my $proc = "/proc/$pid/status"; + $debug_proc + .= qq|$proc
|
+					.  read_file($proc)
+					.  qq|
| + if -e $proc; + } push @rows, ( $name => $html ); } - warn 'static_pids: ', dump( $static_pids ); + warn 'static_pids: ', dump( $static_pids ) if $debug; foreach my $pid ( keys %$static_pids ) { my $path = $static_pids->{$pid}; if ( -d "/proc/$pid" ) { @@ -166,7 +177,11 @@ } } - print $client $ok, html::table( 2, @rows ); + print $client $ok + , html::table( 2, @rows ) + , html::tabs( log::mac_changes ) + , $debug_proc + ; } elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) { eval 'our $' . $1 . ' = ' . $2;