Changeset 1736 for trunk/LATMOS-Accounts

Timestamp:

03/29/16 17:37:21 (8 years ago)

Author:

nanardon

Message:

task automatedrequest is not mandatory anymore

File:

• trunk/LATMOS-Accounts/lib/LATMOS/Accounts/SyncManager.pm (modified) (3 diffs)

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

@@ -38 +38 @@
     };
 
-    foreach my $section (qw(basessynchro refreshexpired automatedrequest)) {
+    foreach my $section (qw(basessynchro refreshexpired)) {
         if ( !grep {
             lc($ini->val($_, 'type', '')) eq $section
@@ -105 +105 @@
     my ($self, $module) = @_;
 
-    my $ini = $self->_load_state_ini or return;
+    my $ini = $self->_load_state_ini or return(0, 0);
 
     return ($ini->val($module, 'rev', 0), $ini->val($module, 'time', 0));
@@ -155 +155 @@
         }
 
-        my ($lastrev) = $self->get_last_rev($module);
+        my ($lastrev, $lastRunTime) = $self->get_last_rev($module);
         my $currentrev = $self->dbrev;
         if (!$task->needupd($lastrev, $currentrev, $self)) {
             la_log LA_DEBUG, "No change on main base, aborting";
+            return 1;
+        }
+
+        my $currentTime = time;
+
+        if ($currentTime < $lastRunTime + $task->runDelay) {
+            la_log LA_DEBUG, "Too short delay to run task, waiting";
             return 1;
         }