--- lib/PXElator/httpd.pm 2009/07/30 23:57:19 72 +++ lib/PXElator/httpd.pm 2009/08/13 13:06:18 216 @@ -17,18 +17,17 @@ use File::Slurp; #use JSON; use IO::Socket::INET; -use Module::Refresh; +use Regexp::Common qw/net/; -our $pids; -$pids = { httpd => $$ } unless defined $pids; # keep pids on refresh +sub menu {qq{ -sub DESTROY { - warn "pids ",dump( $pids ); - foreach ( values %$pids ) { - warn "kill $_"; - kill 1,$_ || kill 9, $_; - } -} +
+home +server +client +
+ +}} our $port = 7777; @@ -38,6 +37,20 @@ use html; our $static_pids; +use progress_bar; +use config; +use client; +use log; +use x11; +use amt; +use boolean; +use daemons; + +use kvm; +use browser; +use network; + +use CouchDB; sub static { my ($client,$path) = @_; @@ -49,7 +62,6 @@ if ( my $pid = fork ) { # parent close($client); - print "http static child $pid\n"; $static_pids->{$pid} = $path; return 1; } @@ -64,144 +76,209 @@ print $client "HTTP/1.0 200 OK\r\nContent-Type: $type\r\nContent-Length: $size\r\nConnection: close\r\n\r\n"; open(my $fh, $full); - print "static $path $type $size\n"; - my $block = 8192; + my $block = 1400; # try not to fragment packages (pxelinux seems to have problems with it) my $buff; my $pos = 0; + CouchDB::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost }); + + progress_bar::start; + while( my $len = read $fh, $buff, $block ) { print $client $buff; + $client->flush; $pos += $len; - printf "%s %d/%d %.2f%%\r", $path, $pos, $size, $pos * 100 / $size; + progress_bar::tick( $path, $pos, $size ); } close($fh); close($client); - print "$path $pos == $size OK\n"; + print STDERR "\n"; - exit; + exit(0); } -use boolean; - -use screen; -use kvm; - -$SIG{CHLD} = 'IGNORE'; - -sub start_stop { - my $daemon = shift; - my $pid = $pids->{$daemon}; - - warn "start_stop $daemon $pid pids: ",dump( $pids ); - - if ( $pid =~ m{^\d+$} ) { - warn "kill 9 $pid"; - kill 9, $pid; - $pids->{$daemon} = 'stopped'; - 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(' . ( @_ ? dump(@_) : '' ) . ')'; - warn "eval $eval"; - eval $eval; - warn "can't start $daemon: $@" if $@; - exit; - } else { - die "fork error $!"; - } - } +sub ok { + qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu() } -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 redirect { + my $to = shift; + $to ||= $url; + qq|HTTP/1.1 302 Found\r\nContent-type: text/html\r\nLocation: $to\r\n\r\n| +} sub get_request { my ( $client, $path, $param ) = @_; - warn "get_request $client $path ",dump( $param ); + server->refresh; + + CouchDB::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } ); if ( my $found = static( $client,$path ) ) { warn "static $found" if $debug; } elsif ( $path eq '/' ) { - 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|; - my @rows = ( - 'ip', html::tt( $server::ip ), - 'netmask', html::tt( $server::netmask ), - 'debug', qq|$debug|, ); - my $debug_proc; + my $debug_proc = ''; + + foreach my $name ( sort keys %$daemons::pids ) { + my $pid = $daemons::pids->{$name} || next; + + my $html; + + my $proc = "/proc/$pid/status"; + + if ( -e $proc ) { + $html .= qq|$pid|; + if ( $debug ) { + $html .= qq| ?|; + + $debug_proc + .= qq|$proc
|
+						.  read_file($proc)
+						.  qq|
| + ; + } - warn 'pids: ', dump( $pids ); - foreach my $name ( keys %$pids ) { - my $pid = $pids->{$name} || next; - - my $html = qq|$pid|; - - if ( $debug ) { - $html .= qq| ?|; - - my $proc = "/proc/$pid/status"; - $debug_proc - .= qq|$proc
|
-					.  read_file($proc)
-					.  qq|
| - if -e $proc; + if ( $name->can('start_fork') ) { + $html .= qq| $_| foreach $name->start_fork; + } + + if ( $name->can('actions') ) { + $html .= qq| $_| foreach $name->actions; + } + } else { + $html .= qq|restart $pid exited|; } push @rows, ( $name => $html ); } - warn 'static_pids: ', dump( $static_pids ); + my $below_table = ''; + + warn 'static_pids: ', dump( $static_pids ) if $debug; foreach my $pid ( keys %$static_pids ) { my $path = $static_pids->{$pid}; if ( -d "/proc/$pid" ) { push @rows, ( $path => qq|$pid| ); + } elsif ( $param->{clean_completed_downloads} ) { + delete $static_pids->{$pid} } else { push @rows, ( $path => "$pid competed" ); + $below_table = qq|clean completed downloads|; } } - print $client $ok + print $client ok , html::table( 2, @rows ) + , $below_table , html::tabs( log::mac_changes ) , $debug_proc ; + } elsif ( $path =~ m{^/server} ) { + print $client ok + , html::table( 2, map { ( $_, html::tt eval '$server::'.$_ ) } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir', 'conf' ) ) + ; + } elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) { + my $ip = $1 || $client->peerhost; + + if ( my $new_ip = $param->{change_ip} ) { + client::change_ip( $ip, $new_ip ); + $ip = $new_ip; + } + + if ( $ip ne $server::ip ) { + my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} ); + + my @table = ( + 'ip' => qq|