move common audit parts back into store

[pxelator] / lib / PXElator / CouchDB.pm

diff --git a/lib/PXElator/CouchDB.pm b/lib/PXElator/CouchDB.pm
index 7e012f2..1d1401b 100644 (file)
--- a/lib/PXElator/CouchDB.pm
+++ b/lib/PXElator/CouchDB.pm
@@ -12,6 +12,7 @@ use Time::HiRes qw/time/;
 use Data::Structure::Util qw(unbless);
 use Scalar::Util qw/blessed/;
 use Storable qw/dclone/;
+use Carp qw/carp/;
 
 sub new {
        my ($class, $host, $port, $options) = @_;
@@ -60,10 +61,18 @@ sub request {
 
 our $rev;
 
+sub rev {
+       my ($self,$url) = @_;
+       my $rev = $rev->{$url};
+       $rev  ||= eval { $self->get( $url )->{_rev} };
+#      warn "# rev $url $rev";
+       return $rev;
+}
+
 sub delete {
        my ($self, $url) = @_;
 
-       $self->request(DELETE => $url);
+       $self->request(DELETE => $url . '?rev=' . $self->rev($url) );
 }
 
 sub get {
@@ -75,16 +84,26 @@ sub get {
 sub put {
        my ($self, $url, $json) = @_;
 
-       if ( ! defined $json->{_rev} ) {
-               my $old = eval { $self->get( $url )->{_rev} };
-               $rev->{$url} = $json->{_rev} = $old if defined $old;
-       }
+       $json->{_rev} = $rev->{$url} if defined $rev->{$url};
 
-       $json = unbless dclone $json if blessed $json;
+       my $data = dclone $json;
+       $data = unbless $data if blessed $data;
 
-       $json = JSON->new->utf8->encode( $json ) if $json;
+#      warn "# put ",dump( $data );
 
-       $self->request(PUT => $url, $json);
+       $json = JSON->new->utf8->encode( $data );
+
+       carp "# put ",$json;
+
+       do {
+               my $json = eval { $self->request(PUT => $url, $json) };
+               if ( $@ ) {
+                       $rev->{$url} = $self->rev( $url );
+                       warn "refresh rev $url = ", $rev->{$url};
+               } else {
+                       $rev->{$url} = JSON->new->decode( $json )->{rev};
+               }
+       } until ! $@;
 }
 
 sub post {
@@ -95,24 +114,9 @@ sub post {
 
 our $audit = __PACKAGE__->new;
 
-sub audit {
-       my $data = pop @_;
-
-       my $url = join(' ', @_);
-       $url =~ s/\s+-\S+//g;   # remove command line options
-       $url =~ s/\W+/-/g;
-
-       my ( $package, $file, $line, $sub ) = caller(1);
-       ( $package, undef, $line ) = caller(0) if $package eq 'main';
-
-       my $time = time();
-
-       $data->{$_} = eval '$' . $_ foreach ( qw/time package line sub/ );
-
-       warn 'audit ', dump($data), "at $file +$line\n";
-
-       $time = int($time); # reduce granularity
-       $audit->put( "pxelator/$time.$package.$url", $data );
+sub _store_audit {
+       my ( $id, $data ) = @_;
+       $audit->put( "pxelator/$id", $data );
 }
 
 1;