Changeset 1201

Timestamp:

12/27/12 18:26:32 (11 years ago)

Author:

nanardon

Message:

add tools to reset (bug #3)

Location:

trunk/LATMOS-Accounts

Files:

• MANIFEST (modified) (3 diffs)
• Makefile.PL (modified) (1 diff)
• bin/la-sync (modified) (1 diff)
• bin/la-sync-ctl (added)
• lib/LATMOS/Accounts/SyncManager.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Task.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Task/Buildnet.pm (modified) (1 diff)

trunk/LATMOS-Accounts/MANIFEST

@@ -9 +9 @@
 bin/la-expired-reminder
 bin/la-find-expired
-bin/la-sql-freeip
 bin/la-gen-passwd
 bin/la-graph.pl
@@ -24 +23 @@
 bin/la-sql-edit-form
 bin/la-sql-exchange-ip
+bin/la-sql-freeip
 bin/la-sql-list-request
 bin/la-sql-loadatt
@@ -32 +32 @@
 bin/la-sql-valid-request
 bin/la-sync
+bin/la-sync-ctl
 bin/la-sync-manager
 bin/la-sync-process

trunk/LATMOS-Accounts/Makefile.PL

@@ -50 +50 @@
         bin/la-sync
         bin/la-sync-manager
+        bin/la-sync-ctl
         bin/la-warn-expire
         bin/la-sql-freeip

trunk/LATMOS-Accounts/bin/la-sync

@@ -83 +83 @@
 
 if ($batch) {
+    warn "Using la-sync -b is deprecated, use la-sync-ctl -s instead\n";
     exit ($LA->call_batch_sync ? 0 : 1);
 }

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

@@ -190 +190 @@
 }
 
+=head2 reset_module_checkpoint($module)
+
+Reset the checkpoint for module C<$module> to force it to run at next
+synchronisation.
+
+=cut
+
+sub reset_module_checkpoint {
+    my ($self, $module) = @_;
+    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;
+    };
+    $task->init or do {
+        la_log LA_ERR, "Cannot init module %s", $_;
+        return;
+    };
+
+    my $ini = $self->_load_state_ini or return;
+
+    $ini->delval($module, 'rev');
+    $ini->newval($module, 'time', 0);
+    $ini->SetParameterComment(
+        $module, 'time',
+        'Reset to 0 the ' . scalar(localtime(time)),
+    );
+
+    $task->reset_checkpoint; # Specific reset
+    $ini->RewriteConfig;
+}
+
 1;
 

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

@@ -90 +90 @@
 }
 
+=head2 reset_checkpoint
+
+Reset the checkpoint to 0 to force the module to be run again
+
+=cut
+
+sub reset_checkpoint {
+    return 1;
+}
+
 1;
 

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

@@ -814 +814 @@
 }
 
+sub reset_checkpoint {
+    my ($self) = @_;
+    foreach my $zone ($self->_base->search_objects('netzone')) {
+        my $ozone = $self->_base->get_object('netzone', $zone)
+            or next;
+
+        $self->_bnet_state->newval($ozone->id, 'dbrev', 0);
+        la_log LA_DEBUG, "Zone checkpoint reset for %s", $ozone->id;
+        $self->_bnet_state->SetParameterComment(
+            $ozone->id, 'dbrev',
+            'Reset checkpoint the ' . scalar(localtime));
+    }
+
+    $self->_write_state_file;
+}
+
 1;