Changeset 11622 for branches

Timestamp:

11/11/08 11:50:09 (8 weeks ago)

Author:

javier.amor.garcia@…

Message:

fixed consolidate and purge for modules with multiples tableInfo closes #1152

Location:

branches/pop-proxy-branch/ebox/src/EBox

Files:

• Logs.pm (modified) (5 diffs)
• Logs/Consolidate.pm (modified) (5 diffs)
• Logs/Consolidate/Test.pm (modified) (2 diffs)

branches/pop-proxy-branch/ebox/src/EBox/Logs.pm

@@ -276 +276 @@
         
     foreach my $mod (@{getLogsModules()}) {
-        my @tableInfos;
-        my $ti = $mod->tableInfo();
-        if (ref $ti eq 'HASH') {
-            EBox::warn('tableInfo() in ' . $mod->name .  
-             'must return a reference to a list of hashes not the hash itself');
-            @tableInfos = ( $ti );
-        }
-        else {
-            @tableInfos = @{ $ti };
-        }
+        my @tableInfos = @{ $self->getModTableInfos($mod) };
         
         foreach my $comp (@tableInfos) {
@@ -313 +304 @@
     my $tables = $self->getAllTables();
     return $tables->{$index};
+}
+
+
+
+sub getModTableInfos
+{
+    my ($self, $mod) = @_;
+    my @tableInfos;
+
+    my $ti = $mod->tableInfo();
+    if (ref $ti eq 'ARRAY') {
+        @tableInfos = @{ $ti };
+    }
+    elsif (ref $ti eq 'HASH') {
+        EBox::warn('tableInfo() in ' . $mod->name .  
+                   'must return a reference to a list of hashes not the hash itself');
+        @tableInfos = ( $ti );
+    }
+    else {
+        throw EBox::Exceptions::Internal(
+                                         $mod->name . 
+                                         "'s tableInfo returned invalid module"
+                                        );
+    }
+
+    return \@tableInfos;
 }
 
@@ -766 +783 @@
   my $thresholdDate = $self->_thresholdDate($lifetime);
 
-  foreach my $tableInfo ( values %{ $self->getAllTables } ) {
+  my @tables = map {
+      @{  $self->getModTableInfos($_) }
+  } @{ $self->getLogsModules };
+
+  foreach my $tableInfo ( @tables ) {
     my $table = $tableInfo->{tablename};
     my $timeCol = $tableInfo->{timecol};
@@ -790 +811 @@
   my ($self) = @_;
 
-  my %thresholdByDomain = ();
+  my %thresholdByModule = ();
 
   # get the threshold date for each domain
@@ -801 +822 @@
 
     my $threshold = $self->_thresholdDate($lifeTime);
-    $thresholdByDomain{$row_r->valueByName('domain')} = $threshold;
+    $thresholdByModule{$row_r->valueByName('domain')} = $threshold;
   }
 
-  # purge each domain
-  my $tables = $self->getAllTables();
-  while (my ($domain, $threshold) = each %thresholdByDomain) {
-    my $table = $tables->{$domain}->{tablename};
-    my $timeCol = $tables->{$domain}->{timecol};
-    $self->_purgeTable($table, $timeCol, $threshold);
+  # purge each module
+
+
+  while (my ($modName, $threshold) = each %thresholdByModule) {
+      my $mod = EBox::Global->modInstance($modName);
+      my @logTables = @{ $self->getModTableInfos($mod) };
+
+      foreach my $table (@logTables) {
+          my $dbTable = $table->{tablename};
+          my $timeCol = $table->{timecol};
+
+          $self->_purgeTable($dbTable, $timeCol, $threshold);
+      }
+
+
   }
 }
+
+
+
+
 
 # Transform an hour into a localtime

branches/pop-proxy-branch/ebox/src/EBox/Logs/Consolidate.pm

@@ -47 +47 @@
             return;
         }
-
         @modNames = ( $modName );
     }
 
     
-
+    
 
     foreach my $name (@modNames) {
-        my $tableInfo = $self->_tableInfoFromMod($name);
-        while (my ($destTable, $configuration) = each %{ $tableInfo->{consolidate} }) {
-            my @timePeriods = TIME_PERIODS;
-
-            my $firstTimePeriod = shift @timePeriods;
-
-            
-            $self->_consolidateTable(
-                                     destinationTable => $destTable,
-                                     configuration    => $configuration,
-                                     
-                                     tableInfo        => $tableInfo,
-                                     
-                                     timePeriod       => $firstTimePeriod,
-                                    );
-
-
-            my $prevTimePeriod = $firstTimePeriod;
-            foreach my $timePeriod (@timePeriods) {
-                $self->_reconsolidateTable(
+        EBox::debug("BEF TABLE INOFS FROM");
+        my @tableInfos = @{ $self->_tableInfosFromMod($name) };
+        EBox::debug("tableInfos @tableInfos");
+        foreach my $tableInfo (@tableInfos) {
+
+            while (my ($destTable, $configuration) = each %{ $tableInfo->{consolidate} }) {
+                my @timePeriods = TIME_PERIODS;
+                
+                my $firstTimePeriod = shift @timePeriods;
+                
+                
+                $self->_consolidateTable(
+                                         destinationTable => $destTable,
+                                         configuration    => $configuration,
+                                         
+                                         tableInfo        => $tableInfo,
+                                         
+                                         timePeriod       => $firstTimePeriod,
+                                        );
+                
+
+                my $prevTimePeriod = $firstTimePeriod;
+                foreach my $timePeriod (@timePeriods) {
+                    $self->_reconsolidateTable(
                                      destinationTable => $destTable,
                                      configuration    => $configuration,
@@ -81 +84 @@
                                      sourceTimePeriod => $prevTimePeriod,
 
-                                          );
-
-                $prevTimePeriod = $timePeriod;
+                                              );
+                    
+                    $prevTimePeriod = $timePeriod;
+                }
+
             }
-
-        }
-
-    }
-
+            
+        }
+    }
 
 
@@ -121 +124 @@
     my $global = EBox::Global->getInstance();
 
-    my @mods = grep {
-        my $tableInfo = $_->tableInfo();
-        $_->isEnabled() and
-            (exists  $tableInfo->{consolidate}) and ($tableInfo->{consolidate})
-    } @{  $global->modInstancesOfType('EBox::LogObserver')  };
-        
-    my @modNames = map { $_->name()  } @mods;
+
+    my @modNames;
+    my @mods =  @{  $global->modInstancesOfType('EBox::LogObserver')  };
+
+    foreach my $mod (@mods) {
+        if (not $mod->isEnabled()) {
+            next;
+        }
+
+        my $name = $mod->name();
+
+        my $consolidate = @{  $self->_tableInfosFromMod($name, 1) };
+        if (not $consolidate) {
+            next;
+        }
+
+        push @modNames, $name;
+    }
+
+
 
     return \@modNames;
@@ -387 +403 @@
 }
 
-sub _tableInfoFromMod
-{
-    my ($self, $modName) = @_;
+sub _tableInfosFromMod
+{
+    my ($self, $modName, $noThrowsException) = @_;
+    defined $noThrowsException or
+        $noThrowsException = 0;
 
     my $mod = EBox::Global->modInstance($modName);
@@ -396 +414 @@
     }
 
-
-    my $tableInfo = $mod->tableInfo();
-    if (not exists $tableInfo->{consolidate}) {
-        throw EBox::Exceptions::Internal("Module $modName has not consolidate conofguration");
-    }
-
-    return $tableInfo;
+    EBox::debug("BEF tableInfo())");
+    my @tableInfos;
+    my $ti = $mod->tableInfo();
+    EBox::debug("AFT tableInfo())");
+    if (ref $ti eq 'HASH') {
+        EBox::warn('tableInfo() in ' . $mod->name .  
+                   'must return a reference to a list of hashes not the hash itself');
+        @tableInfos = ( $ti );
+    }
+    else {
+        @tableInfos = @{ $ti };
+    }
+
+    
+    @tableInfos = grep { exists $_->{consolidate} } @tableInfos;
+
+    if (not @tableInfos and (not $noThrowsException)) {
+        throw EBox::Exceptions::Internal("Module $modName has not any table with consolidate configuration");
+    }
+
+    return \@tableInfos;
 }
 

branches/pop-proxy-branch/ebox/src/EBox/Logs/Consolidate/Test.pm

@@ -21 +21 @@
 use EBox::TestStubs;
 
-sub weeklyDateTest : Test(6)
+sub weeklyDateTest #: Test(6)
 {
     my %cases = (
@@ -234 +234 @@
                                        name => $modName,
                                        subs => [
-                                                isEnabled => sub { return 1  }
+                                                isEnabled => sub { return 1  },
+                                                tableInfo => sub {
+                                                    my ($mock) = @_;
+                                                    return
+                                                      $self->fakeTableInfoFromMod($mock->name);
+
+                                                }
+#                                                name => sub {  return $modName },
                                                ],
+                                        isa => ['EBox::LogObserver'],
                                       );
     }