Changeset 1824 for trunk/LATMOS-Accounts

Timestamp:

07/11/16 14:43:44 (8 years ago)

Author:

nanardon

Message:

Order module to optimize data update

Location:

trunk/LATMOS-Accounts

Files:

• bin/la-sync-manager (modified) (1 diff)
• lib/LATMOS/Accounts/SyncManager.pm (modified) (2 diffs)
• lib/LATMOS/Accounts/Task.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Task/Basessynchro.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Task/Employment.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Task/Refreshexpired.pm (modified) (1 diff)

trunk/LATMOS-Accounts/bin/la-sync-manager

@@ -120 +120 @@
         $SIG{INT} = 'DEFAULT';
         my $res = 0;
-        foreach my $module ($syncm->list_modules()) {
+        foreach my $module ($syncm->listSortedModules()) {
             $res = 1 if (!$syncm->process_module($module));
         }

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

@@ -121 +121 @@
 }
 
-=head2 process_module($module)
-
-Process C<$module>.
-
-=cut
-
-# TODO what is $dbrev, why is it need here ??
-
-sub process_module {
-    my ($self, $module) = @_;
-
-    eval {
-        if (!$self->ini->SectionExists($module)) {
-            la_log LA_ERR, "Cannot run inexistant module %s", $module;
-            return;
-        }
-
+
+=head2 listSortedModules
+
+List configured module ordered for running
+
+=cut
+
+sub listSortedModules {
+    my ($self) = @_;
+
+    my %modules = ();
+
+    foreach my $module ($self->list_modules) {
+        $modules{$module} = 1;
         my $modtype = $self->ini->val($module, 'type', $module);
         my $task = LATMOS::Accounts::Task->new(
@@ -147 +144 @@
             or do {
             la_log(LA_ERR, 'Cannot load module %s', $modtype);
+            next;
+        };
+
+        $modules{$module} = $task->order;
+    }
+
+    return sort { $modules{$a} <=> $modules{$b} } keys %modules;
+}
+
+=head2 process_module($module)
+
+Process C<$module>.
+
+=cut
+
+# TODO what is $dbrev, why is it need here ??
+
+sub process_module {
+    my ($self, $module) = @_;
+
+    eval {
+        if (!$self->ini->SectionExists($module)) {
+            la_log LA_ERR, "Cannot run inexistant module %s", $module;
+            return;
+        }
+
+        my $modtype = $self->ini->val($module, 'type', $module);
+        my $task = LATMOS::Accounts::Task->new(
+            $modtype,
+            config => $self->{config},
+            name   => $module,
+            syncm  => $self,
+        )
+            or do {
+            la_log(LA_ERR, 'Cannot load module %s', $modtype);
             return;
         };

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

@@ -48 +48 @@
     return $self->{syncm}->ini->val($self->{name}, $value, $default)
 }
+
+=head2 order
+
+Return the priority for the module: 0, 1 or 3 (0 = first)
+
+=cut
+
+sub order { 1 }
 
 =head2 init

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Basessynchro.pm

@@ -16 +16 @@
 
 =cut
+
+sub order { 2 }
 
 sub run {

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Employment.pm

@@ -16 +16 @@
 
 =cut
+
+sub order { 0 }
 
 sub init {

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Refreshexpired.pm

@@ -25 +25 @@
 
 =cut
+
+sub order { 0 }
 
 # Every 10 minutes