--- lib/PXElator/httpd.pm 2009/08/12 22:56:45 207 +++ lib/PXElator/httpd.pm 2009/08/15 22:38:02 224 @@ -24,6 +24,7 @@
@@ -49,6 +50,7 @@ use kvm; use browser; use network; +use ip; use CouchDB; @@ -63,7 +65,6 @@ # parent close($client); $static_pids->{$pid} = $path; - CouchDB::audit('static', 'parent', { pid => $pid, path => $path }); return 1; } @@ -82,7 +83,7 @@ my $buff; my $pos = 0; - CouchDB::audit( 'static', 'child', { pid => $$, path => $path, type => $type, size => $size, block => $block }); + CouchDB::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost }); progress_bar::start; @@ -97,8 +98,6 @@ print STDERR "\n"; - CouchDB::audit( 'static', 'child', 'exit', { pid => $$ } ); - exit(0); } @@ -117,7 +116,7 @@ server->refresh; - CouchDB::audit( 'request', { path => $path, param => $param } ); + CouchDB::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } ); if ( my $found = static( $client,$path ) ) { warn "static $found" if $debug; @@ -206,10 +205,10 @@ my $deploy; - if ( my $mac = client::mac( $ip ) ) { + if ( my $mac = client::mac_from_ip( $ip ) ) { $deploy = client::conf( $ip, 'deploy' => $param->{deploy} ); push @table, ( - 'mac' => $mac, + 'mac' => format::mac( $mac => 'html' ), 'deploy' => html::select( 'deploy', $deploy, config::available ) ); $deploy = qq|