Changeset 2316

Timestamp:

12/02/19 22:22:34 (5 years ago)

Author:

nanardon

Message:

Call post-synchro in a efficient way

This patch add callback to base allowing to web part to know when
commit() were done. Then call_sync_batch is run only when commit were
successfully done.

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Data.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Login.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Remote/Listing.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Remote/Search.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Stat.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/Accounts.pm (modified) (2 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases.pm (modified) (3 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Data.pm

@@ -30 +30 @@
     my ( $self, $c ) = @_;
 
-    $c->stash->{NoSync} = 1;
-
     $c->stash->{data} ||= {};
     $c->forward('CSV');

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Json.pm

@@ -31 +31 @@
     my ( $self, $c ) = @_;
 
-    $c->stash->{NoSync} = 1;
-
     $c->stash->{data} ||= {};
     $c->forward($c->view('Json'));

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Login.pm

@@ -29 +29 @@
 sub index :Path :Args(0) {
     my ( $self, $c ) = @_;
-
-    $c->stash->{NoSync} = 1;
 
     if ($c->req->param('username')) {

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Remote/Listing.pm

@@ -51 +51 @@
     }
 
-    $c->stash->{NoSync} = 1;
     $c->stash->{data} = \%objects;
 }

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Remote/Search.pm

@@ -27 +27 @@
     my $otype = $c->req->param('otype');
     my @search = $c->req->param('q');
-    $c->stash->{NoSync} = 1;
 
     push(@search, 'oalias=NULL') unless($c->req->param('oalias'));

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm

@@ -159 +159 @@
     $c->forward($c->view('TT')) unless($c->res->body);
     $c->model('Accounts')->db->rollback;
-    $c->model('Accounts')->call_batch_sync unless($c->stash->{NoSync});
+
+    # DBNeedSync is set by the model when commit() is by base
+    if ($c->stash->{DBNeedSync}) {
+        $c->model('Accounts')->call_batch_sync;
+    }
 }
 

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Stat.pm

@@ -25 +25 @@
     my ( $self, $c ) = @_;
 
-    $c->stash->{NoSync} = 1;
 }
 

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/Accounts.pm

@@ -51 +51 @@
     $self->{_default_base} and return $self->{_default_base};
     $self->{_default_base} = $self->base;
+    $self->{_default_base}->SetCallBack(
+        'commit',
+        sub { $self->{c}->stash->{DBNeedSync} = 1; }
+    );
     $self->{_default_base}->load or return;
     $self->{_default_base}->wexported(1);
@@ -205 +209 @@
     my ($self) = @_;
 
+    $self->{c}->log->debug('Running call_batch_sync()');
+
     if (my $command = $self->{c}->config->{callSyncCmd}) {
         if (system($command) != 0) {

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

@@ -60 +60 @@
     $base->{_la} = $options->{la};
 
+    # Callback, the list bellow give the supported callback
+    $base->{_cb} = $options->{cb} || {
+        commit => undef,
+        postcommit => undef,
+    };
+
     $base->SetConnectedUser($ENV{LA_USERNAME}) if ($ENV{LA_USERNAME});
 
     la_log(LA_DEBUG, 'Instanciate base %s (%s)', ($base->label || 'N/A'), $pclass);
     $base
+}
+
+=head2 SetCallBack( $cb, $code )
+
+Set callbalc $<cb> to function C<$code>.
+
+=cut
+
+sub SetCallBack {
+    my ( $self, $cb, $code ) = @_;
+
+    if (exists ($self->{_cb}{$cb})) {
+        return $self->{_cb}{$cb} = $code;
+    }
+}
+
+=head2 GetCallBack( $cb )
+
+Set callback $<cb> to function C<$code>.
+
+=cut
+
+sub GetCallBack {
+    my ( $self, $cb ) = @_;
+
+    if (exists ($self->{_cb}{$cb})) {
+        $self->{_cb}{$cb} || sub { 1; };
+    }
 }
 
@@ -879 +913 @@
     }
 
+    $self->GetCallBack('commit')->();
+
     $self->postcommit();
 
@@ -902 +938 @@
             }
         );
+        $self->GetCallBack('postcommit')->();
     } else {
         return 1;