strict removal only of command-line params

[pxelator] / lib / PXElator / daemons.pm

diff --git a/lib/PXElator/daemons.pm b/lib/PXElator/daemons.pm
index 28aa8b2..a3d5477 100644 (file)
--- a/lib/PXElator/daemons.pm
+++ b/lib/PXElator/daemons.pm
@@ -7,6 +7,7 @@ use File::Slurp;
 use Data::Dump qw/dump/;
 
 use x11;
+use CouchDB;
 
 our $pids;
 $pids = { httpd => $$, kvm => 'not started' } unless defined $pids; # keep pids on refresh
@@ -21,6 +22,12 @@ sub DESTROY {
 
 $SIG{CHLD} = 'IGNORE';
 
+sub audit {
+       my $msg = shift;
+       my $daemon = shift;
+       CouchDB::audit( $msg, $daemon, { daemon => $daemon, message => $msg, @_ } );
+}
+
 sub start_stop {
        my $daemon = shift;
 
@@ -30,10 +37,10 @@ sub start_stop {
        if ( ! $pid && -e $pid_path ) {
                my $p = read_file $pid_path;
                if ( kill 0, $p ) {
-                       warn "adopted $daemon $p\n";
+                       audit 'adopted', $daemon, pid => $p;
                        return $pids->{$daemon} = $p;
                } else {
-                       warn "old $daemon $p not running";
+                       audit 'not running', $daemon, pid => $p;
                        unlink $pid_path;
                }
        }
@@ -47,13 +54,14 @@ sub start_stop {
                warn "pstree $pstree pids ",dump( @pids );
                kill 1, $_ foreach reverse @pids;
                $pids->{$daemon} = 'stopped';
+               audit 'stopped', $daemon, pid => $pid;
                return qq|$daemon pid $pid stopped|;
        } else {
                if ( $pid = fork ) {
                        # parent
                        $pids->{$daemon} = $pid;
                        write_file $pid_path, $pid;
-                       warn "forked $daemon $pid\n";
+                       audit 'forked', $daemon, pid => $pid;
                        return qq|$daemon pid $pid started|;
                } elsif ( defined $pid ) {
                        # child
@@ -61,16 +69,17 @@ sub start_stop {
                        $invoke = $1 if $daemon =~ s{/(.+)}{};
                        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";
+                               audit 'exec', $daemon, 'exec' => $exec;
                                x11::xterm( $daemon => $exec );
                        } else {
                                my $eval = $daemon . '::' . $invoke . '(' . ( @_ ? dump(@_) : '' ) . ')';
-                               warn "eval $eval";
+                               audit 'eval', $daemon, 'eval' => $eval;
                                eval $eval;
-                               warn "can't start $daemon: $@" if $@;
+                               audit 'error', $daemon, error => $@  if $@;
                        }
                        exit;
                } else {
+                       audit 'error', $daemon, error => $!;
                        die "fork error $!";
                }
        }