--- lib/PXElator/httpd.pm 2009/07/31 22:52:22 104 +++ lib/PXElator/httpd.pm 2009/08/09 16:37:46 179 @@ -17,7 +17,17 @@ use File::Slurp; #use JSON; use IO::Socket::INET; -use Module::Refresh; +use Regexp::Common qw/net/; + +sub menu {qq{ + +
+ +}} our $pids; $pids = { httpd => $$ } unless defined $pids; # keep pids on refresh @@ -38,8 +48,11 @@ use html; our $static_pids; - -use Time::HiRes qw/time/; +use progress_bar; +use config; +use client; +use log; +use x11; sub static { my ($client,$path) = @_; @@ -48,8 +61,6 @@ return if ! -f $full; - my $start_t = time(); - if ( my $pid = fork ) { # parent close($client); @@ -65,8 +76,6 @@ my $size = -s $full || return; - $client->autoflush(1); - 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); @@ -75,35 +84,35 @@ my $buff; my $pos = 0; - print "static $path $type $size block: $block\n"; + warn "static $path $type $size block: $block\n"; + + progress_bar::start; while( my $len = read $fh, $buff, $block ) { print $client $buff; + $client->flush; $pos += $len; - printf "%s %d/%d %.2f%% %.2f K/s\r" - , $path, $pos - , $size, $pos * 100 / $size - , ( $pos / 1024 ) / ( time() - $start_t ) - ; + progress_bar::tick( $path, $pos, $size ); } close($fh); close($client); - print "\n"; + print STDERR "\n"; + + warn "exit static child"; - exit; + exit(0); } use boolean; -use screen; use kvm; $SIG{CHLD} = 'IGNORE'; sub start_stop { my $daemon = shift; - my $pid = $pids->{$daemon}; + my $pid = $pids->{$daemon} || 'not started'; warn "start_stop $daemon $pid\n"; @@ -124,10 +133,16 @@ # child my $invoke = 'start'; $invoke = $1 if $daemon =~ s{/(.+)}{}; - my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')'; - warn "eval $eval"; - eval $eval; - warn "can't start $daemon: $@" if $@; + if ( $daemon =~ m{dhcpd|tftpd|dnsd} ) { + my $exec = "perl -I$server::base_dir/lib -I$server::base_dir/lib/PXElator -M$daemon -e ${daemon}::${invoke}"; + warn "exec $exec"; + x11::xterm( $daemon => $exec ); + } else { + my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')'; + warn "eval $eval"; + eval $eval; + warn "can't start $daemon: $@" if $@; + } exit; } else { die "fork error $!"; @@ -135,26 +150,21 @@ } } -my $ok = qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n|; +my $ok = qq|HTTP/1.0 200 OK\r\nContent-Type: text/html\r\nConnection: close\r\n\r\n| . menu(); 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 ) = @_; + server->refresh; + warn "get_request $path ", $param ? dump( $param ) : '', "\n"; 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|, ); @@ -164,11 +174,12 @@ foreach my $name ( sort keys %$pids ) { my $pid = $pids->{$name} || next; - my $html = qq|$pid|; + my $html; my $proc = "/proc/$pid/status"; if ( -e $proc ) { + $html .= qq|$pid|; if ( $debug ) { $html .= qq| ?|; @@ -186,6 +197,8 @@ if ( $name->can('actions') ) { $html .= qq| $_| foreach $name->actions; } + } else { + $html .= qq|restart $pid exited|; } push @rows, ( $name => $html ); @@ -213,12 +226,48 @@ , $debug_proc ; + } elsif ( $path =~ m{^/server} ) { + print $client $ok + , html::table( 2, map { ( $_, eval '$server::'.$_ ) } ( 'ip', 'netmask', 'ip_from', 'ip_to', 'domain_name', 'base_dir' ) ) + ; + } elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) { + my $ip = $1 || $client->peerhost; + if ( $ip ne $server::ip ) { + my $hostname = client::conf( $ip, 'hostname' => $param->{hostname} ); + my $deploy = client::conf( $ip, 'deploy' => $param->{deploy} ); + print $client $ok + , qq|| + , qq|| + , config::for_ip( $ip ) + , qq|| + ; + } else { + print $client $ok + , qq|