Changeset e918af62879698c29f582a6413dda86cab8f98a9 in xas-logmon


Ignore:
Timestamp:
12/02/15 15:28:29 (4 years ago)
Author:
root <root@…>
Branches:
master
Children:
8a80906c03b2b8293c3a4c1f85d8ce9c1f70f41b
Parents:
4377efa95a4897239850cb519eb4979ec477a41b
git-author:
root <root@…> (12/02/15 15:28:29)
git-committer:
root <root@…> (12/02/15 15:28:29)
Message:

fixing logic problems

Location:
trunk/lib/XAS
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/XAS/Apps/Logmon/XAS/Process.pm

    r4377efa95a4897239850cb519eb4979ec477a41b re918af62879698c29f582a6413dda86cab8f98a9  
    7070    while (my $line = $input->get()) { 
    7171 
     72        $self->log->debug(sprintf("line: %s", $line)); 
     73 
    7274        if (my $data = $tasks->parse($line)) { 
    7375 
    7476            next if ($self->reject($data)); 
     77 
     78            $self->log->debug("found tasks"); 
    7579 
    7680            $data = $merge->filter($data, { 
     
    8993            $output->put($event); 
    9094 
    91         } elsif (my $data = $default->parse($line)) { 
     95            next; 
     96 
     97        } 
     98 
     99        if (my $data = $default->parse($line)) { 
    92100 
    93101            next if ($self->reject($data)); 
     102 
     103            $self->log->debug("found default"); 
    94104 
    95105            $data = $merge->filter($data, { 
     
    108118            $output->put($event); 
    109119 
    110         } else { 
     120            next; 
    111121 
    112             $self->log->error_msg('logmon_parserr', trim($line)); 
     122        }  
    113123 
    114         } 
     124        $self->log->error_msg('logmon_parserr', trim($line)); 
    115125 
    116126    } 
  • trunk/lib/XAS/Lib/Regexp/Log/XAS.pm

    r89d2b9fd299d8ae93b2b011db6bb61fa70f57587 re918af62879698c29f582a6413dda86cab8f98a9  
    3232    '%datetime' => '\[(?#=datetime)\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}(?#!datetime)\]\s+', 
    3333    '%level'    => '(?#=level)\w+(?#!level)\s+-\s+', 
    34     '%task'     => '(?#=task)\w+(?#!task):\s+', 
     34    '%task'     => '(?#=task)[\w|-]+(?#!task):\s+', 
    3535    '%message'  => '(?#=message).*(?#!message)', 
    3636); 
  • trunk/lib/XAS/Logmon/Input/Tail.pm

    r71b41918e7074bbc7a6c4c165197e3709e7a086b re918af62879698c29f582a6413dda86cab8f98a9  
    1818  base       => 'XAS::Base', 
    1919  mixin      => $mixin, 
    20   utils      => 'dotid', 
     20  utils      => 'dotid trim', 
    2121  accessors  => 'notifier statefile', 
    2222  filesystem => 'File', 
     
    4949    while (my $line = $fh->getline()) { 
    5050 
    51         push(@{$self->{'buffer'}}, $line); 
     51        push(@{$self->{'buffer'}}, trim($line)); 
    5252 
    5353    } 
Note: See TracChangeset for help on using the changeset viewer.