kristuff / parselog

src/Software/ApacheErrorLogParser.php

Spacing +31 added lines, -31 removed lines

@@ -179,23 +179,23 @@ 
         // set 2.2 format by default. Will be changed to 2.4 format, ie:
         // $this->timeFormat        = 'D M d H:i:s.u Y';
         // , if the format contains %{u} instead of %t  
-        $this->timeFormat        = 'D M d H:i:s Y';
+        $this->timeFormat = 'D M d H:i:s Y';
 
-        $this->addFormat('default',                         self::FORMAT_APACHE_2_4_DEFAULT);  
-        $this->addFormat('apache2.2 default',               self::FORMAT_APACHE_2_2_DEFAULT);  
-        $this->addFormat('apache2.2 extented',              self::FORMAT_APACHE_2_2_EXTENDED);  
-        $this->addFormat('apache2.2 referer',               self::FORMAT_APACHE_2_2_REFERER);  
-        $this->addFormat('apache2.2 extented referer',      self::FORMAT_APACHE_2_2_EXTENDED_REFERER);  
-        $this->addFormat('apache2.4 default',               self::FORMAT_APACHE_2_4_DEFAULT);  
-        $this->addFormat('apache2.4 extented',              self::FORMAT_APACHE_2_4_EXTENDED);  
-        $this->addFormat('apache2.4 referer',               self::FORMAT_APACHE_2_4_REFEFER);  
-        $this->addFormat('apache2.4 extented referer',      self::FORMAT_APACHE_2_4_EXTENDED_REFERER);  
-        $this->addFormat('apache2.4 mpm',                   self::FORMAT_APACHE_2_4_MPM);  
-        $this->addFormat('apache2.4 mpm extented',          self::FORMAT_APACHE_2_4_MPM_EXTENDED);  
-        $this->addFormat('apache2.4 mpm referer',           self::FORMAT_APACHE_2_4_MPM_REFERER);  
+        $this->addFormat('default', self::FORMAT_APACHE_2_4_DEFAULT);  
+        $this->addFormat('apache2.2 default', self::FORMAT_APACHE_2_2_DEFAULT);  
+        $this->addFormat('apache2.2 extented', self::FORMAT_APACHE_2_2_EXTENDED);  
+        $this->addFormat('apache2.2 referer', self::FORMAT_APACHE_2_2_REFERER);  
+        $this->addFormat('apache2.2 extented referer', self::FORMAT_APACHE_2_2_EXTENDED_REFERER);  
+        $this->addFormat('apache2.4 default', self::FORMAT_APACHE_2_4_DEFAULT);  
+        $this->addFormat('apache2.4 extented', self::FORMAT_APACHE_2_4_EXTENDED);  
+        $this->addFormat('apache2.4 referer', self::FORMAT_APACHE_2_4_REFEFER);  
+        $this->addFormat('apache2.4 extented referer', self::FORMAT_APACHE_2_4_EXTENDED_REFERER);  
+        $this->addFormat('apache2.4 mpm', self::FORMAT_APACHE_2_4_MPM);  
+        $this->addFormat('apache2.4 mpm extented', self::FORMAT_APACHE_2_4_MPM_EXTENDED);  
+        $this->addFormat('apache2.4 mpm referer', self::FORMAT_APACHE_2_4_MPM_REFERER);  
         $this->addFormat('apache2.4 mpm extented referer ', self::FORMAT_APACHE_2_4_MPM_EXTENDED_REFERER);  
-        $this->addFormat('apache2.4 mpm tid',               self::FORMAT_APACHE_2_4_MPM_TID);  
-        $this->addFormat('apache2.4 mpm tid referer',       self::FORMAT_APACHE_2_4_MPM_TID_REFERER);  
+        $this->addFormat('apache2.4 mpm tid', self::FORMAT_APACHE_2_4_MPM_TID);  
+        $this->addFormat('apache2.4 mpm tid referer', self::FORMAT_APACHE_2_4_MPM_TID_REFERER);  
 
         $this->addPath("/var/log/");
         $this->addPath("/var/log/apache/");
@@ -217,7 +217,7 @@ 
         // define patterns
         // ***************
 
-        $this->addNamedPattern('%%' , 'percent', '\%');
+        $this->addNamedPattern('%%', 'percent', '\%');
                 
         // %t 	        The current time
         // %{u}t 	The current time including micro-seconds
@@ -228,29 +228,29 @@ 
         
         // %a 	Client IP address and port of the request (port is not registered by parser). 
         //      That column may be missing depending of error
-        $clientIpPattern = '( \[client (?P<remoteIp>' . self::PATTERN_IP_ALL . ')(:[\d]+|)?\])?';
-        $this->addPattern(' \[client %a\]' , $clientIpPattern);
-        $this->addPattern(' \[%a\]' ,  $clientIpPattern);
-        $this->addPattern(' %a' , $clientIpPattern);
+        $clientIpPattern = '( \[client (?P<remoteIp>'.self::PATTERN_IP_ALL.')(:[\d]+|)?\])?';
+        $this->addPattern(' \[client %a\]', $clientIpPattern);
+        $this->addPattern(' \[%a\]', $clientIpPattern);
+        $this->addPattern(' %a', $clientIpPattern);
 
         // %A 	Local IP-address and port
         //      That column may be missing depending of error
-        $this->addNamedPattern('%A',  'localIP', self::PATTERN_IP_ALL, false);
+        $this->addNamedPattern('%A', 'localIP', self::PATTERN_IP_ALL, false);
         
         // %m 	Name of the module logging the message
         // %l 	Loglevel of the message
-        $this->addPattern('\[%m:%l\]',  '\[(?<module>.+?)?:(?P<level>[\w]+)\]');
+        $this->addPattern('\[%m:%l\]', '\[(?<module>.+?)?:(?P<level>[\w]+)\]');
         $this->addPattern('\[%-m:%l\]', '\[(?<module>.+?)?:(?P<level>[\w]+)\]');
-        $this->addPattern('\[%l\]',     '\[(?P<level>[\w:]+)\]');
-        $this->addPattern('%l',         '\[(?P<level>[\w:]+)\]');
+        $this->addPattern('\[%l\]', '\[(?P<level>[\w:]+)\]');
+        $this->addPattern('%l', '\[(?P<level>[\w:]+)\]');
 
         // %P 	Process ID of current process (since apache 2.4?)
         // %T 	Thread ID of current thread
         $this->addPattern('\[pid %P:tid %T\]', '\[pid (?P<pid>\d+):tid (?P<tid>\d+)\]'); 
-        $this->addPattern('%P %T',             '\[pid (?P<pid>\d+):tid (?P<tid>\d+)\]');
+        $this->addPattern('%P %T', '\[pid (?P<pid>\d+):tid (?P<tid>\d+)\]');
         $this->addPattern('\[pid %P\]', '\[pid (?P<pid>\d+)\]');
-        $this->addPattern('\[%P\]',     '\[pid (?P<pid>\d+)\]');   
-        $this->addPattern('%P',         '\[pid (?P<pid>\d+)\]');
+        $this->addPattern('\[%P\]', '\[pid (?P<pid>\d+)\]');   
+        $this->addPattern('%P', '\[pid (?P<pid>\d+)\]');
         
         // %E 	APR/OS error status code and string
         //      That column may be missing depending of error
@@ -261,11 +261,11 @@ 
         $this->addPattern(' %F:', '( (?P<fileName>[^ ]+\([\d]+\)):)?');              
 
         // %M 	The actual log message
-        $this->addNamedPattern('%M',  'message', '.+?');
+        $this->addNamedPattern('%M', 'message', '.+?');
 
         // referer (may be empty)
-        $this->addPattern(' , referer %{Referer}i',   '(, referer: (?P<referer>[^ ]+))?');
-        $this->addPattern(', referer %{Referer}i',    '(, referer: (?P<referer>[^ ]+))?');
+        $this->addPattern(' , referer %{Referer}i', '(, referer: (?P<referer>[^ ]+))?');
+        $this->addPattern(', referer %{Referer}i', '(, referer: (?P<referer>[^ ]+))?');
 
         // now let default constructor
         parent::__construct($format, $factory);
@@ -284,7 +284,7 @@ 
         parent::setFormat($format);
 
         // set the correct time format
-        if (strpos($this->logFormat, '%{u}t') !== false){
+        if (strpos($this->logFormat, '%{u}t') !== false) {
             $this->timeFormat = 'D M d H:i:s.u Y';
         }
     }