Changeset 2496

Timestamp:

11/30/21 14:55:37 (3 years ago)

Author:

nanardon

Message:

Add default value for state_dir, factorize it

Location:

trunk/LATMOS-Accounts

Files:

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

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

@@ -146 +146 @@
 {
     my $LA = LATMOS::Accounts->new($config, noacl => 1);
-    if ($LA->val('_default_', 'state_dir')) {
-        $pidfile = $LA->val('_default_', 'state_dir') . '/sync-manager.pid';
+    if (my $dir = $LA->state_dir) {
+        $pidfile = $dir . '/sync-manager.pid';
     }
     if (my $mail = $LA->val('_network_', 'maillog')) {

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

@@ -96 +96 @@
 
     $self
+}
+
+=head2 state_dir
+
+Return state_dir for this instance
+
+=cut
+
+sub state_dir {
+    my ( $self ) = @_;
+
+    return $self->val( '_default_', 'state_dir', '/var/lib/latmos-accounts' );
 }
 
@@ -289 +301 @@
     my $sync = LATMOS::Accounts::Synchro->new(
         $labfrom, [ @labto ],
-        state_dir => ($self->val('_default_', 'state_dir') || undef),
+        state_dir => $self->state_dir,
         %options,
         name => $name,
@@ -340 +352 @@
 sub call_batch_sync {
     my ($self) = @_;
-    if (my $sd = $self->val('_default_', 'state_dir')) {
+    if (my $sd = $self->state_dir) {
         if (open(my $fh, '<', $sd . '/sync-manager.pid')) {
             my $pid = <$fh> || '';

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

@@ -61 +61 @@
 sub ini { $_[0]->{ini} }
 
-=head2 LA
-
-Return a LATMOS::Accounts setup for SynchM
-
-=cut
-
-sub LA {
-    my ( $self ) = @_;
-
-    return LATMOS::Accounts->new($self->{config}, noacl => 1, loguser => '@SyncManager');
-}
-
 =head2 dbrev
 
@@ -81 +69 @@
 sub dbrev {
     my ($self) = @_;
-    my $LA = $self->LA;
+    my $LA = LATMOS::Accounts->new($self->{config}, noacl => 1);
     my $base = $LA->base;
     return $base->current_rev;
@@ -88 +76 @@
 sub _load_state_ini {
     my ($self) = @_;
-    my $la = $self->LA;
-
-    my $state_file =  $la->val('_default_', 'state_dir', '/');
-    $state_file .= '/la-sync-manager.ini';
+    my $la = LATMOS::Accounts->new($self->{config}, noacl => 1);
+
+    my $state_file =  $la->state_dir . '/la-sync-manager.ini';
     la_log(LA_DEBUG, "Status file is %s", $state_file);
     if ($state_file && ! -w $state_file) {

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

@@ -121 +121 @@
     return $self->{_bnet_state} if ($self->{_bnet_state});
     # where trace goes:
-    my $state_file =  $self->_la->val('_default_', 'state_dir', '/');
-    $state_file .= '/buildnet_state.ini';
+    my $state_file =  $self->state_dir . '/buildnet_state.ini';
     la_log(LA_DEBUG, "Status file is %s", $state_file);
     if ($state_file && ! -w $state_file) {
@@ -159 +158 @@
         '/',
         $self->_la->val('_network_', 'output_dir',
-            ($self->_la->val('_default_', 'state_dir'), $ozone->get_attributes('type'))
+            ($self->_la->state_dir, $ozone->get_attributes('type'))
         )
     );