--- lib/PXElator/httpd.pm 2009/07/30 20:15:39 66 +++ lib/PXElator/httpd.pm 2009/07/30 21:31:30 67 @@ -30,9 +30,9 @@ } our $port = 7777; -our $debug = 0; use server; +our $debug = server::debug; our $url = "http://$server::ip:$port"; use html; @@ -73,8 +73,6 @@ 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; @@ -86,9 +84,9 @@ 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; $pids->{$daemon} = 'stopped'; @@ -101,7 +99,7 @@ return qq|$daemon pid $pid started|; } elsif ( defined $pid ) { # child - my $eval = $daemon . '::start(' . dump(@_) . ')'; + my $eval = $daemon . '::start(' . ( @_ ? dump(@_) : '' ) . ')'; warn "eval $eval"; eval $eval; warn "can't start $daemon: $@" if $@; @@ -112,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 ) = @_; @@ -133,10 +134,11 @@ ); foreach my $name ( %$pids ) { my $pid = $pids->{$name} || next; + my $proc = "/proc/$pid/status"; my $html = qq|$pid|; $html .= qq|
|
-					.  ( $debug ? read_file("/proc/$pid/status") : '' )
+					.  ( $debug && -e $proc ? read_file($proc) : '' )
 					.  qq|
| if $debug; push @rows, ( $name => $html ); @@ -147,9 +149,10 @@ } 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
Location: $url|; + print $client $redirect, qq|$1 = $2
Location: $url|; + server::debug( $debug ) if $1 eq 'debug'; } elsif ( $path =~ m{^/(screen|kvm)} ) { - print $client $ok, start_stop($1); + print $client $redirect, start_stop($1); } elsif ( $path eq '/exit' ) { # DESTROY; exit 0;