Changeset 819

Timestamp:

03/10/10 00:40:38 (14 years ago)

Author:

nanardon

Message:

• set LA_UPDATED env. var. when running post script: indicate if data were updated, the script can skip useless work so
• take into account script error code if any, then assume there were an error

Location:

LATMOS-Accounts

Files:

• Makefile.PL (modified) (1 diff)
• lib/LATMOS/Accounts/Synchro.pm (modified) (7 diffs)

LATMOS-Accounts/Makefile.PL

@@ -5 +5 @@
 WriteMakefile(
     NAME              => 'LATMOS::Accounts',
-    VERSION           => '0.0.19', # finds $VERSION
+    VERSION           => '0.0.20', # finds $VERSION
     PREREQ_PM         => {
         'Net::LDAP' => undef,

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

@@ -141 +141 @@
         $_->wexported($state{$_->label});
     }
-    $self->run_post_synchro;
 }
 
@@ -214 +213 @@
     my %desterror;
     my %existings;
+    my $updated = 0;
     foreach my $destbase ($self->to) {
         my %objlist;
@@ -225 +225 @@
             foreach ($destbase->list_objects($otype)) {
                 if(!$existings{$otype}{$_}) {
-                    my $res = $destbase->sync_object_from($self->from, $otype, $_, %options);
-                    la_log(LA_NOTICE, "%s::%s::%s => %s %s",
-                        $self->from->label, $otype, $_, $destbase->label, $res,
-                    ) if ($res);
+                    if (my $res = $destbase->sync_object_from($self->from,
+                            $otype, $_, %options)) {
+                        la_log(LA_NOTICE, "%s::%s::%s => %s %s",
+                            $self->from->label, $otype, $_, $destbase->label, $res,
+                        );
+                        $updated = 1;
+                    }
                 }
             }
@@ -246 +249 @@
                         %options, firstpass => $pass);
                     if (defined $res) {
-                        la_log(LA_NOTICE, "%s::%s::%s => %s %s",
-                            $self->from->label, $otype, $_,
-                            $destbase->label, $res,
-                        ) if ($res);
+                        if ($res) {
+                            la_log(LA_NOTICE, "%s::%s::%s => %s %s",
+                                $self->from->label, $otype, $_,
+                                $destbase->label, $res,
+                            );
+                            $updated = 1;
+                        }
                     } else {
                         la_log(LA_ERR, "Cannot synch %s::%s::%s => %s",
@@ -264 +270 @@
 
     $self->leave_synch_mode(%state);
-    foreach my $destbase ($self->to) {
-        # don't register checkpoint 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;
+    my $res = $self->run_post_synchro(
+        {
+            UPDATED => $updated,
+        }
+    );
+    if ($res) {
+        foreach my $destbase ($self->to) {
+            # don't register checkpoint 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;
+        }
+    } else {
+        la_log(LA_ERROR, "Not updating status because post script failed");
     }
 
@@ -299 +314 @@
 
 sub run_post_synchro {
-    my ($self) = @_;
+    my ($self, $env) = @_;
 
     $self->{options}{post} or return 1;
@@ -305 +320 @@
     la_log(LA_INFO, "Running post synchro `%s'", $self->{options}{post});
 
-    exec_command($self->{options}{post}, $self->{options});
+    exec_command($self->{options}{post}, $env);
 }