--- lib/PXElator/httpd.pm 2009/07/30 23:57:19 72 +++ lib/PXElator/httpd.pm 2009/07/31 18:16:14 88 @@ -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 { @@ -109,7 +111,9 @@ return qq|$daemon pid $pid started|; } elsif ( defined $pid ) { # child - my $eval = $daemon . '::start(' . ( @_ ? dump(@_) : '' ) . ')'; + my $invoke = 'start'; + $invoke = $1 if $daemon =~ s{/(.+)}{}; + my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')'; warn "eval $eval"; eval $eval; warn "can't start $daemon: $@" if $@; @@ -145,27 +149,38 @@ my $debug_proc; - warn 'pids: ', dump( $pids ); - foreach my $name ( keys %$pids ) { + warn 'pids: ', dump( $pids ) if $debug; + foreach my $name ( sort keys %$pids ) { my $pid = $pids->{$name} || next; my $html = qq|$pid|; - if ( $debug ) { - $html .= qq| ?|; + my $proc = "/proc/$pid/status"; - my $proc = "/proc/$pid/status"; - $debug_proc - .= qq|$proc
| - . read_file($proc) - . qq|| - if -e $proc; + if ( -e $proc ) { + if ( $debug ) { + $html .= qq| ?|; + + $debug_proc + .= qq|$proc
| + . read_file($proc) + . qq|| + ; + } + + if ( $name->can('start_fork') ) { + $html .= qq| $_| foreach $name->start_fork; + } + + if ( $name->can('actions') ) { + $html .= qq| $_| foreach $name->actions; + } } 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" ) { @@ -186,11 +201,14 @@ warn $@ if $@; print $client $redirect, qq|$1 = $2