Changeset 11606 for branches

Timestamp:

11/10/08 11:20:17 (8 weeks ago)

Author:

javier.amor.garcia@…

Message:

changed implementation detail refs #1149

Files:

• branches/pop-proxy-branch/mailfilter/src/EBox/MailFilter/LogHelper.pm (modified) (3 diffs)

branches/pop-proxy-branch/mailfilter/src/EBox/MailFilter/LogHelper.pm

@@ -170 +170 @@
         $p3scanSpam += 1;
     }
-    elsif ($line =~ m{p3scan\[\d+\]: Session done.*Clean Exit.* Mails: (.*) Bytes:} ) {
-        my $mails = $1;
+    elsif ($line =~ m{p3scan\[\d+\]: Session done.*\((.*?)\).* Mails: (.*) Bytes:} ) {
+        my $status = $1;
+        my $event;
+        if ($status eq 'Clean Exit') {
+            $event = 'pop3_fetch_ok';
+        }
+        else { # $status ~= m/abort/
+            $event = 'pop3_fetch_failed';
+            
+        }
+
+
+        my $mails = $2;
         my $cleanMails = $mails  - $p3scanVirus - $p3scanSpam;
 
@@ -177 +188 @@
 
         my $values = {
-                      event => 'pop3_fetch_ok',
+                      event => $event,
                       address => $p3scanAddress,
                       
@@ -195 +206 @@
     $dbengine->insert(POP_PROXY_TABLE, $values);
     }
-    # abort
-    elsif ($line =~ m{p3scan\[\d+\]: Session done.* abort.* Mails: (.*) Bytes:} ) {
-        my $mails = $1;
-        my $cleanMails = $mails  - $p3scanVirus - $p3scanSpam;
-
-        my $date = $self->_getDate($line);
-
-        my $values = {
-                      event => 'pop3_fetch_failed',
-                      address => $p3scanAddress,
-                      
-                      mails  => $mails,
-                      clean   => $cleanMails,
-                      virus  => $p3scanVirus,
-                      spam   => $p3scanSpam,
-                      
-                      clientConn => $p3scanClientConn,
-
-                      
-                      date => $date,
-                     };
-
-
-
-    $dbengine->insert(POP_PROXY_TABLE, $values);
-    }
-           
-    
-
-
 
 }