--- lib/PXElator/httpd.pm 2009/07/30 14:16:13 56
+++ lib/PXElator/httpd.pm 2009/07/30 14:16:59 57
@@ -18,15 +18,10 @@
#use JSON;
use IO::Socket::INET;
use Module::Refresh;
-use Parallel::ForkManager;
our $port = 7777;
our $debug = 1;
-my $pm = Parallel::ForkManager->new(10);
-
-our $screen_pid;
-
use server;
our $url = "http://$server::ip:$port/";
@@ -59,7 +54,42 @@
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';
+
+sub start_stop {
+ my $daemon = shift;
+ my $pid = $pids->{$daemon};
+
+ warn "start_stop $daemon pids: ",dump( $pids );
+
+ if ( $pid ) {
+ warn "kill 9 $pid";
+ kill 9, $pid;
+ delete $pids->{$daemon};
+ return qq|$daemon pid $pid stopped|;
+ } else {
+ if ( $pid = fork ) {
+ # parent
+ $pids->{$daemon} = $pid;
+ warn "forked $daemon $pid";
+ return qq|$daemon pid $pid started|;
+ } elsif ( defined $pid ) {
+ # child
+ my $eval = $daemon . '::start';
+ warn "eval $eval";
+ eval $eval;
+ warn "can't start $daemon: $@" if $@;
+ exit;
+ } else {
+ die "fork error $!";
+ }
+ }
+}
sub get_request {
my ( $client, $path, $param ) = @_;
@@ -70,40 +100,24 @@
warn "static $found" if $debug;
} elsif ( $path eq '/' ) {
- my $screen = $screen_pid ? qq|stop $screen_pid| : 'start';
+ my $screen = $pids->{screen} ? qq|stop $pids->{screen}| : 'start';
+ my $kvm = $pids->{kvm} ? qq|stop $pids->{kvm}| :
+ $pids->{screen} ? qq|start| : qq|start screen first|;
print $client $ok,
html::table( 2,
- 'pid', $$,
- 'debug', qq|$debug|,
+ 'pid', $$,
+ 'debug', qq|$debug|,
'screen', qq|$screen|,
+ 'kvm', qq|$kvm|,
);
} 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|;
- } elsif ( $path =~ m{^/screen} ) {
-
- if ( $screen_pid ) {
- if ( ! kill $screen_pid ) {
- warn "kill -9 $screen_pid";
- if ( kill 9, $screen_pid ) {
- print $client $ok, qq|screen pid $screen_pid stopped|;
- $screen_pid = 0;
- } else {
- print $client $ok, qq|can't stop screen $screen_pid: $!|;
- }
- }
- } else {
- if ( $screen_pid = $pm->start ) {
- print $client $ok, qq|screen started pid $screen_pid|;
- } else {
- screen::start;
- $pm->finish;
- }
- }
-
+ } elsif ( $path =~ m{^/(screen|kvm)} ) {
+ print $client $ok, start_stop($1);
} elsif ( $path =~ m{/boot} ) {
print $client qq{$ok
#!gpxe