--- lib/PXElator/httpd.pm 2009/07/30 17:07:48 65 +++ lib/PXElator/httpd.pm 2009/07/30 21:31:30 67 @@ -19,10 +19,20 @@ use IO::Socket::INET; use Module::Refresh; +our $pids = { httpd => $$ }; + +sub DESTROY { + warn "pids ",dump( $pids ); + foreach ( values %$pids ) { + warn "kill $_"; + kill 1,$_ || kill 9, $_; + } +} + our $port = 7777; -our $debug = 1; use server; +our $debug = server::debug; our $url = "http://$server::ip:$port"; use html; @@ -63,13 +73,10 @@ return $path; } -my $ok = "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n"; - use boolean; use screen; use kvm; -our $pids; $SIG{CHLD} = 'IGNORE'; @@ -77,12 +84,12 @@ my $daemon = shift; my $pid = $pids->{$daemon}; - warn "start_stop $daemon pids: ",dump( $pids ); + warn "start_stop $daemon $pid pids: ",dump( $pids ); - if ( $pid ) { + if ( $pid =~ m{^\d+$} ) { warn "kill 9 $pid"; kill 9, $pid; - delete $pids->{$daemon}; + $pids->{$daemon} = 'stopped'; return qq|$daemon pid $pid stopped|; } else { if ( $pid = fork ) { @@ -92,7 +99,7 @@ return qq|$daemon pid $pid started|; } elsif ( defined $pid ) { # child - my $eval = $daemon . '::start'; + my $eval = $daemon . '::start(' . ( @_ ? dump(@_) : '' ) . ')'; warn "eval $eval"; eval $eval; warn "can't start $daemon: $@" if $@; @@ -103,6 +110,9 @@ } } +my $ok = qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n|; +my $redirect = qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $url\r\n\r\n|; + sub get_request { my ( $client, $path, $param ) = @_; @@ -116,22 +126,36 @@ my $kvm = $pids->{kvm} ? qq|stop $pids->{kvm}| : $pids->{screen} ? qq|start| : qq|start screen first|; - print $client $ok, - html::table( 2, - 'pid', html::tt( $$ ), + my @rows = ( 'ip', html::tt( $server::ip ), 'netmask', html::tt( $server::netmask ), + 'debug', qq|$debug|, - 'screen', qq|$screen|, - 'kvm', qq|$kvm|, ); + foreach my $name ( %$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; + + push @rows, ( $name => $html ); + } + + print $client $ok, html::table( 2, @rows ); } elsif ( $path =~ m{^/our/(\w+)/(\S+)} ) { eval 'our $' . $1 . ' = ' . $2; warn $@ if $@; - print $client qq|HTTP/1.1 302 Found\r\nLocation: $url\r\nContent-type: text/html\r\n\r\n$1 = $2