Changeset 11612 for branches

Timestamp:

11/10/08 16:11:38 (8 weeks ago)

Author:

javier.amor.garcia@…

Message:

moere changes to allow multi-table modules refs #1149

Location:

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

Files:

• Loggerd.pm (modified) (3 diffs)
• Logs.pm (modified) (6 diffs)
• Logs/Model/ConfigureLogDataTable.pm (modified) (4 diffs)

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

@@ -82 +82 @@
     if (EBox::Config::configkey('debug') eq 'yes') {
         open(STDOUT, "+>$tmp/stout");
-          open(STDERR, "+>$tmp/stderr");
+        open(STDERR, "+>$tmp/stderr");
     }
     
@@ -99 +99 @@
     
     pipe $piperd, $pipewr;
-    $SIG {"INT"} = \&int_handler;
+    $SIG{"INT"} = \&int_handler;
     
     my @loghelpers = @{$self->{'loghelpers'}};
@@ -105 +105 @@
         for my $file (@{$obj->logFiles()}) {
             my $tail;
-            eval { $tail = File::Tail->new(name => $file, 
-                                           interval => 1, maxinterval => 1,
-                                           ignore_nonexistant => 1)};
+            eval { 
+                $tail = File::Tail->new(name => $file, 
+                                        interval => 1, maxinterval => 1,
+                                        ignore_nonexistant => 1)
+               };
 
             if ($@) {

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

@@ -104 +104 @@
     my ($self) = @_;
         
-    $self->_saveEnabledLogs();
+    $self->_saveEnabledLogsModules();
     _stopService();
 
@@ -212 +212 @@
     my $global = EBox::Global->getInstance();
 
-    my $enabledLogs = $self->_restoreEnabledLogs(); 
+    my $enabledLogs = $self->_restoreEnabledLogsModules(); 
         
     # If there's no configuration stored it means the user
@@ -222 +222 @@
     my @enabledObjects;
     my @mods = @{$global->modInstancesOfType('EBox::LogObserver')};
-    foreach my $object (@mods) {
-        my @tableInfos;
-        my $ti = $object->tableInfo();
-        if (ref $ti eq 'HASH') {
-            EBox::warn('tableInfo() in ' . $object->name .  
-             ' must return a reference to a list of hashes not the hash itself');
-
-            @tableInfos = ( $ti );
+    foreach my $mod  (@mods) {
+        if ( $enabledLogs->{$mod->name } ) {
+            push (@enabledObjects, $mod->logHelper());
         }
-        else {
-            @tableInfos = @{ $ti };
-        }
-        
-        foreach my $tableInfo (@tableInfos) {
-            my $domain = $object->tableInfo()->{'index'};
-            if (exists $enabledLogs->{$domain}) {
-                # XXX for now we share the logHelper object by all the log
-                # tables of the same module
-                push (@enabledObjects, $object->logHelper());
-                last;
-            }
-        }
-
-    }
+    }
+
 
     return \@enabledObjects;
@@ -681 +663 @@
 #       query ebox conf.
 #
-sub _saveEnabledLogs
+sub _saveEnabledLogsModules
 {
     my ($self) = @_;
@@ -704 +686 @@
 }
 
-# Method: _restoreEnabledLogs 
+# Method: _restoreEnabledLogsModules 
 #       
 #       (Private)
 #       
 #       This function restores the  enabled logs saved in a file by
-#       <EBox::Logs::_saveEnabledLogs>
+#       <EBox::Logs::_saveEnabledLogsModules>
 #       We have to do this beacuse the logger daemon will request this
 #       configuration as root user.
@@ -720 +702 @@
 #       undef  - if there's no enabled logs stored yet
 #       hash ref containing the enabled logs
-sub _restoreEnabledLogs
+sub _restoreEnabledLogsModules
 {
     my ($self) = @_;

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

@@ -79 +79 @@
 #
 #   
-sub enabledLogs()
-{
-    my $self = shift;
+sub enabledLogs
+{
+    my ($self) = @_;
 
     my %enabledLogs;
@@ -90 +90 @@
     return \%enabledLogs;
 }
+
+
+
+# sub enabledLogsModules
+# {
+#     my ($self) = @_;
+
+#     my %modules;
+
+#     my $enabledLogs = $self->enabledLogs();
+#     my $allTables  = EBox::Global->modInstance('logs')->getAllTables();
+#     foreach my $index  (keys %{ $enabledLogs }) {
+#         exists $allTables->{$index} or 
+#             throw EBox::Exceptions::Internal(
+#                      "$index not found in log tables"
+#                                             );
+
+#         my $mod = $allTables->{$index}->{'helper'};
+#         $modules{$mod->name()} = $mod;
+#     }
+
+#     return [ values %modules  ];
+# }
 
 # Method: rows 
@@ -135 +158 @@
         next if (exists $storedLogDomains{$domain});
 
-        my @tableInfos;
-        my $mod = $currentLogDomains{$domain};
-        my $ti = $mod->tableInfo();
-        
+        my @tableInfos;
+        my $mod = $currentLogDomains{$domain};
+        my $ti = $mod->tableInfo();
+        
         if (ref $ti eq 'HASH') {
             EBox::warn('tableInfo() in ' . $mod->name .  
@@ -148 +171 @@
         }
 
-        my $enabled = not grep {
-          $_->{'disabledByDefault'}  
-        } @tableInfos;
+        my $enabled = not grep {
+          $_->{'disabledByDefault'}  
+        } @tableInfos;