--- lib/PXElator/httpd.pm 2009/08/30 16:36:37 380
+++ lib/PXElator/httpd.pm 2009/09/07 21:34:05 390
@@ -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+$} ) {
@@ -295,7 +298,10 @@
}
}
- print $client qq|
amt info
|, html::pre_dump( amt::info( $ip ) ) if $conf->{amt};
+ if ( $conf->{amt} ) {
+ print $client qq|amt network
|, html::pre_dump( amt::network( $ip ) );
+ print $client qq|amt log
|, html::pre_dump( amt::log( $ip ) );
+ }
} else {
@@ -380,7 +386,7 @@
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();
print $client redirect;
@@ -398,9 +404,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',