--- lib/PXElator/daemons.pm	2009/08/09 21:13:36	185
+++ lib/PXElator/daemons.pm	2009/08/17 15:14:58	245
@@ -7,9 +7,14 @@
 use Data::Dump qw/dump/;
 
 use x11;
+use CouchDB;
 
 our $pids;
-$pids = { httpd => $$ } 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 );
@@ -21,19 +26,27 @@
 
 $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;
 
 	my $pid = $pids->{$daemon};
-	my $pid_path = "$server::conf/$daemon.pid";
+	my $pid_path = "$daemon.pid";
+	$pid_path =~ s{/}{-}g;
+	$pid_path = "$server::conf/$pid_path";
 
 	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;
 		}
 	}
@@ -41,36 +54,45 @@
 	$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 {
 		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
 			my $invoke = 'start';
 			$invoke = $1 if $daemon =~ s{/(.+)}{};
-			if ( $daemon =~ m{dhcpd|tftpd|dnsd} ) {
+			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}";
-				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 $!";
 		}
 	}