Changeset 1805

Timestamp:

06/28/16 19:13:18 (8 years ago)

Author:

nanardon

Message:

Mark sync point immediatelly after base sync and not after whole process

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Synchro.pm (modified) (4 diffs)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Synchro.pm

@@ -31 +31 @@
 =cut
 
-our $VERSION = (q$Rev$ =~ /^Rev: (\d+) /)[0];
+our $VERSION = (q$Rev: 1384 $ =~ /^Rev: (\d+) /)[0];
 
 =head2 new($from, $to, %options)
@@ -170 +170 @@
     $self->from->wexported($state{$self->from->label});
     foreach my $base (grep { $_ } $self->to) {
-        $base->commit;
         $base->wexported($state{$base->label});
     }
@@ -395 +394 @@
             }
         }
+        if (!$desterror{$destbase->label}) {
+            $destbase->commit if(!$destbase->is_transactionnal);
+            $self->newval($self->from->label, $destbase->label, $self->{current_rev});
+            if(!($self->{options}{nocreate} || $self->{options}{test})) {
+                $self->write_status;
+                la_log(LA_NOTICE,
+                    "Update synch. status to %d for base %s to %s",
+                    $self->{current_rev}, $self->from->label, $destbase->label
+                ); 
+            }
+        }
     }
 
@@ -403 +413 @@
         }
     );
-    if ($res) {
-        foreach my $destbase ($self->to) {
-            # don't register savepoint on error
-            if ($desterror{$destbase->label}) { next; }
-            $self->newval($self->from->label, $destbase->label, $self->{current_rev});
-        }
-
-        if(!($self->{options}{nocreate} ||
-                $self->{options}{test})) {
-            $self->write_status;
-        }
+    if ($res) { 
     } else {
-        la_log(LA_ERROR, "Not updating status because post script failed");
+        la_log(LA_ERROR, "Post synchronization script failed: %s", $res);
     }