--- lib/PXElator/httpd.pm 2009/08/30 22:46:57 385
+++ lib/PXElator/httpd.pm 2009/09/07 21:57:35 392
@@ -173,12 +173,15 @@
;
}
- if ( $name->can('fork_if_active') ) {
- $html .= qq| $_| foreach $name->fork_if_active;
+ my $class = $name;
+ $class =~ s{\.\d+$}{};
+
+ if ( $class->can('fork_if_active') ) {
+ $html .= qq| $_| foreach $class->fork_if_active;
}
- if ( $name->can('actions') ) {
- $html .= qq| $_| foreach $name->actions;
+ if ( $class->can('actions') ) {
+ $html .= qq| $_| foreach $class->actions;
}
} else {
if ( $pid =~ m{^\d+$} ) {
@@ -220,13 +223,19 @@
;
} elsif ( $path =~ m{^/server} ) {
+ if ( my $c = $param->{new_clients} ) {
+ server::shared( 'new_clients', $c );
+ }
print $client ok
+ , qq|
|
;
} elsif ( $path =~ m!^/client(?:/$RE{net}{IPv4}{-keep})?! ) {
my $ip = $1;
@@ -383,9 +392,11 @@
print $client redirect($url), qq|$1 = $2
Location: $url|;
server::debug( $debug ) if $1 eq 'debug';
} elsif ( $path =~ m{^/start_stop/(\S+)} ) {
- print $client redirect, daemons::start_stop($1);
+ print $client redirect, daemons::start_stop($1,$param);
} elsif ( $path =~ m{^/action/([^/]+)/(.+)} ) {
- $1->$2();
+ my ( $package, $method ) = ( $1, $2 );
+ $ENV{nr} = $1 if $package =~ s{\.(\d+)$}{};
+ $package->$method();
print $client redirect;
} elsif ( $path =~ m{^/kill/static/(\d+)} ) {
print $client redirect;
@@ -401,9 +412,9 @@
warn 'network ', network::setup();
- daemons::start_stop 'browser', $url;
+ daemons::start_stop 'browser', { url => $url };
daemons::start_stop $_ foreach ( qw/dhcpd tftpd dnsd syslogd/ );
- daemons::start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device
+# daemons::start_stop 'kvm' unless $ENV{DEV}; # skip kvm statup when running on real device
my $server = IO::Socket::INET->new(
Proto => 'tcp',