extract nr from kvm.nr

[pxelator] / lib / PXElator / daemons.pm

diff --git a/lib/PXElator/daemons.pm b/lib/PXElator/daemons.pm
index a3d5477..ee17802 100644 (file)
--- a/lib/PXElator/daemons.pm
+++ b/lib/PXElator/daemons.pm
@@ -7,10 +7,14 @@ use File::Slurp;
 use Data::Dump qw/dump/;
 
 use x11;
-use CouchDB;
+use store;
 
 our $pids;
-$pids = { httpd => $$, kvm => 'not started' } unless defined $pids; # keep pids on refresh
+$pids = {
+       httpd => $$,
+       kvm => 'not started',
+       wireshark => 'not started',
+} unless defined $pids; # keep pids on refresh
 
 sub DESTROY {
        warn "pids ",dump( $pids );
@@ -25,14 +29,26 @@ $SIG{CHLD} = 'IGNORE';
 sub audit {
        my $msg = shift;
        my $daemon = shift;
-       CouchDB::audit( $msg, $daemon, { daemon => $daemon, message => $msg, @_ } );
+       store::audit( $msg, $daemon, { daemon => $daemon, message => $msg, @_ } );
 }
 
+mkdir "$server::conf/pid" unless -d "$server::conf/pid";
+
 sub start_stop {
-       my $daemon = shift;
+       my ($daemon,$param) = @_;
+
+       if ( defined $param->{nr} ) { # XXX nr for kvm
+               $daemon .= '.' . $param->{nr};
+       } else {
+               $param->{nr} = $1 if $daemon =~ /\.(\d+)/;
+       }
 
        my $pid = $pids->{$daemon};
-       my $pid_path = "$server::conf/$daemon.pid";
+       my $pid_path = $daemon;
+       $pid_path =~ s{/}{-}g;
+       $pid_path = "$server::conf/pid/$pid_path";
+
+       warn "# start_stop $daemon ",dump( $param );
 
        if ( ! $pid && -e $pid_path ) {
                my $p = read_file $pid_path;
@@ -48,31 +64,46 @@ sub start_stop {
        $pid ||= 'not started';
        warn "start_stop $daemon $pid\n";
 
-       if ( $pid =~ m{^\d+$} ) {
+       if ( $pid =~ m{^\d+$} && kill 0, $pid ) {
                my $pstree = `pstree -p $pid`;
                my @pids = $pstree =~ m{\((\d+)\)}g;
                warn "pstree $pstree pids ",dump( @pids );
-               kill 1, $_ foreach reverse @pids;
+               foreach ( @pids ) {
+                       warn "kill $_\n";
+                       kill 1, $_;
+                       if ( kill 0, $_ ) {
+                               warn "kill 9 $_";
+                               kill 9, $_;
+                       }
+               }
                $pids->{$daemon} = 'stopped';
                audit 'stopped', $daemon, pid => $pid;
                return qq|$daemon pid $pid stopped|;
        } else {
+
+               $ENV{$_} = $param->{$_} foreach keys %$param;
+
                if ( $pid = fork ) {
                        # parent
                        $pids->{$daemon} = $pid;
                        write_file $pid_path, $pid;
                        audit 'forked', $daemon, pid => $pid;
+
+                       delete $ENV{$_} foreach keys %$param; # cleanup enviroment
+
                        return qq|$daemon pid $pid started|;
                } elsif ( defined $pid ) {
                        # child
                        my $invoke = 'start';
                        $invoke = $1 if $daemon =~ s{/(.+)}{};
-                       if ( $daemon =~ m{dhcpd|tftpd|dnsd} ) {
+                       #warn "## ENV child ",dump( %ENV );
+                       if ( $daemon =~ m{dhcpd|tftpd|dnsd|syslogd} ) {
                                my $exec = "perl -I$server::base_dir/lib -I$server::base_dir/lib/PXElator -M$daemon -e ${daemon}::${invoke}";
                                audit 'exec', $daemon, 'exec' => $exec;
                                x11::xterm( $daemon => $exec );
                        } else {
-                               my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')';
+                               $daemon =~ s{\.\d+$}{} if defined $ENV{nr};
+                               my $eval = $daemon . '::' . $invoke . '(' . dump( $param ) . ')';
                                audit 'eval', $daemon, 'eval' => $eval;
                                eval $eval;
                                audit 'error', $daemon, error => $@  if $@;