Changeset 2416

Timestamp:

06/25/20 09:25:24 (4 years ago)

Author:

nanardon

Message:

Make la-rename continue even if rename failed in one base (or object is not found)

Location:

trunk/LATMOS-Accounts

Files:

• bin/la-rename (modified) (1 diff)
• lib/LATMOS/Accounts/SynchAccess/base.pm (modified) (5 diffs)

trunk/LATMOS-Accounts/bin/la-rename

@@ -59 +59 @@
 $labase->wexported(1);
 
-my $obj = $labase->get_object($otype, $ARGV[0]) or do {
-    die "Object $otype $ARGV[0] not found\n";
-};
+if ($labase->can('SetCB')) {
+    $labase->SetCB( sub {
+        my ( $base, $res ) = @_;
+        if ($res) {
+            print $base->label . ': Object renamed' . "\n";
+            $base->commit;
+        } else {
+            warn $base->label . ': Cannot rename object' . "\n";
+            $base->rollback;
+        }
+    } );
+}
 
 if (!$labase->rename_object($otype, @ARGV)) {
-    die "Error while renaming $otype $ARGV[0] to $ARGV[1]\n";
+    die "Some errors occurs, please check\n";
 }
 
-$labase->commit;

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/SynchAccess/base.pm

@@ -85 +85 @@
 }
 
+=head2 CB ( @Args )
+
+Run callback if set
+
+=cut
+
+sub CB {
+    my ( $self, @Args ) = @_;
+
+    if ($self->{cb}) {
+        return $self->{cb}->( @Args );
+    } else {
+        return 1;
+    }
+}
+
 sub _return_all {
     my ($self, $sub, @args) = @_;
@@ -90 +106 @@
     foreach my $ba ($self->bases) {
         my @res = $_->$sub(@args);
-        $self->{cb}->($ba, @res) if($self->{cb});
+        $self->CB($ba, @res);
         push(@allres, @res);
     }
@@ -114 +130 @@
     foreach ($self->bases) {
         my $res = $_->$sub(@args);
-        $self->{cb}->($_, $res) if($self->{cb});
+        $self->CB($_, $res);
         $res or do {
                     la_log(LA_ERR, "SyncA: Erreur call $sub() for %s", $_);
@@ -128 +144 @@
     foreach ($self->bases) {
         my $res = $_->$sub(@args) and $failure = 1;
-        $self->{cb}->($_, $res) if($self->{cb});
+        $self->CB($_, $res);
     }
     $failure ? 0 : 1;
@@ -141 +157 @@
     foreach ($self->bases) {
         if ($_->is_supported_object($otype)) {
+            $_->get_object($otype, $uid) or do {
+                $_->log(LA_ERR,
+                    "Cannot get object $otype/$uid",
+                );
+                next;
+            };
+
             my $res = $_->rename_object($otype, $uid, $newuid);
-            $self->{cb}->($_, $res) if($self->{cb});
+            $self->CB($_, $res);
             $res or do {
-                la_log(LA_ERR,
+                la_log(LA_WARN,
                     "Cannot get object $otype/$uid in %s/%s",
                     $_->type,
                     $_->label
                 );
-                return;
+                $_->rollback;
             };
         }