--- lib/PXElator/httpd.pm 2009/07/31 14:43:30 78 +++ lib/PXElator/httpd.pm 2009/07/31 16:47:52 81 @@ -111,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 $@; @@ -153,15 +155,22 @@ 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_options') ) { + $html .= qq| $_| foreach $name->start_options; + } } push @rows, ( $name => $html ); @@ -188,7 +197,7 @@ warn $@ if $@; print $client $redirect, qq|$1 = $2
Location: $url|; server::debug( $debug ) if $1 eq 'debug'; - } elsif ( $path =~ m{^/(screen|kvm)} ) { + } elsif ( $path =~ m{^/((?:screen|kvm).*)} ) { print $client $redirect, start_stop($1); } elsif ( $path =~ m{^/kill/static/(\d+)} ) { print $client $redirect;