Changeset 563

Timestamp:

12/17/09 14:43:52 (15 years ago)

Author:

nanardon

Message:

• propagate state_dir to synchro object

Location:

LATMOS-Accounts/lib/LATMOS

Files:

• Accounts.pm (modified) (1 diff)
• Accounts/Synchro.pm (modified) (3 diffs)

LATMOS-Accounts/lib/LATMOS/Accounts.pm

@@ -180 +180 @@
     my $sync = LATMOS::Accounts::Synchro->new(
         $labfrom, [ @labto ],
-        state_file => ($self->val('_default_', 'state_dir')
-            ? $self->val('_default_', 'state_dir') . '/synchronisation.ini'
-            : undef),
+        state_dir => ($self->val('_default_', 'state_dir') || undef),
         %options,
         name => $name,

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

@@ -42 +42 @@
     my ($class, $from, $to, %options) = @_;
 
-    if ($options{state_file} && ! -w $options{state_file}) {
+    my $state_file = $options{state_dir}
+        ? $options{state_dir} . '/synchronisation.ini'
+        : undef;
+    if ($state_file && ! -w $state_file) {
         # don't exists, we have to create it
-        open(my $handle, '>', $options{state_file}) or do {
-            la_log(LA_ERR, "Cannot open status file %s", $options{state_file});
+        open(my $handle, '>', $state_file) or do {
+            la_log(LA_ERR, "Cannot open status file %s", $state_file);
             return;
         };
@@ -54 +57 @@
     my $self = Config::IniFiles->new(
         $options{state_file}
-        ? (-file => $options{state_file})
+        ? (-file => $state_file)
         : (),
     );
 
-    if ($options{state_file} && !$self->GetFileName) {
-        $self->SetFileName($options{state_file});
+    if ($state_file && !$self->GetFileName) {
+        $self->SetFileName($state_file);
     }
     
@@ -138 +141 @@
     $self->run_post_synchro;
 }
-
 
 sub sync_object {