--- lib/PXElator/httpd.pm 2009/08/11 15:55:26 200 +++ lib/PXElator/httpd.pm 2009/08/15 22:38:02 224 @@ -24,6 +24,7 @@
@@ -49,7 +50,9 @@ use kvm; use browser; use network; +use ip; +use CouchDB; sub static { my ($client,$path) = @_; @@ -61,7 +64,6 @@ if ( my $pid = fork ) { # parent close($client); - print "http static child $pid\n"; $static_pids->{$pid} = $path; return 1; } @@ -81,7 +83,7 @@ my $buff; my $pos = 0; - warn "static $path $type $size block: $block\n"; + CouchDB::audit( 'static', { pid => $$, path => $path, type => $type, size => $size, block => $block, peerhost => $client->peerhost }); progress_bar::start; @@ -96,8 +98,6 @@ print STDERR "\n"; - warn "exit static child"; - exit(0); } @@ -116,7 +116,7 @@ server->refresh; - warn "get_request $path ", $param ? dump( $param ) : '', "\n"; + CouchDB::audit( 'request', { path => $path, param => $param, peerhost => $client->peerhost } ); if ( my $found = static( $client,$path ) ) { warn "static $found" if $debug; @@ -205,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|